Some services were enabled by default which, even though they were
never deployed when prometheus wasn't enabled, could cause problems
if the monitoring inventory group was empty.  Changed these services
to be enabled based on whether prometheus is enabled.

Change-Id: I0956a1b65a3577cd57fe3b16a95bc3d64fc142ba