OS::Metering::Alarm -> OS::Ceilometer::Alarm
OS::Metering::Alarm -> OS::Ceilometer::Alarm

Don't require any special yaml mappings in the environments
section to deal with metering

Change-Id: Ic7055e326cf8f75f97047f028c767ee8bc944fe8

kwrobert/heat-templates,wesparish/heat-templates,tgreenyc/heat-templates,cosminmocan/heat-templates,openstack/heat-templates,varunarya10/heat-templates,chrishultin/heat-templates,chrishultin/heat-templates,bbandaru/heat-templates,wesparish/heat-templates,openstack/heat-templates,varunarya10/heat-templates,andxeg/heat-templates,andxeg/heat-templates,openstack/heat-templates,tgreenyc/heat-templates,rdo-management/heat-templates,bbandaru/heat-templates,cosminmocan/heat-templates,kwrobert/heat-templates,wesparish/heat-templates,chrishultin/heat-templates,kwrobert/heat-templates,bbandaru/heat-templates,andxeg/heat-templates,rdo-management/heat-templates,cosminmocan/heat-templates,tgreenyc/heat-templates,cosminmocan/heat-templates,bbandaru/heat-templates,rdo-management/heat-templates,andxeg/heat-templates,wesparish/heat-templates,rdo-management/heat-templates,rdo-management/heat-templates,chrishultin/heat-templates,tgreenyc/heat-templates,kwrobert/heat-templates