Don't ask for service catalog as we don't need it

Change-Id: Ie5a26cc70c0fecf68bf6b8e963e2c1d629e5d4f4
Fix up some ceilometer brokenness

Change-Id: I759ae16bce8d1b01912b3d7aa60c590389cea196