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

[Corey Bryant]

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