[Merge] ~corey.bryant/ubuntu/+source/ceilometer:master into ~ubuntu-openstack-dev/ubuntu/+source/ceilometer:master

[Corey Bryant]

Superseded by https://code.launchpad.net/~corey.bryant/ubuntu/+source/ceilometer/+git/ceilometer/+merge/438241
-- 
https://code.launchpad.net/~corey.bryant/ubuntu/+source/ceilometer/+git/ceilometer/+merge/438227
Your team Ubuntu OpenStack uploaders is requested to review the proposed merge of ~corey.bryant/ubuntu/+source/ceilometer:master into ~ubuntu-openstack-dev/ubuntu/+source/ceilometer:master.