Merge "Deprecate ceilometer collector"