Merge "Change 'ceilometer' tag to 'telemetry' and add tags to cli tests"