Use Measurement where Metric was incorrectly used
Use Measurement where Metric was incorrectly used

Fix some other typos as well.

Change-Id: I870ca58143c62c0c0e411684eb03fcee691f6e25

openstack/monasca-api,sapcc/monasca-api,openstack/monasca-api,openstack/monasca-api,stackforge/monasca-api,sapcc/monasca-api,sapcc/monasca-api,stackforge/monasca-api,stackforge/monasca-api,stackforge/monasca-api