Merge "Remove unnecessary ceilometer service overrides"