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

[Corey Bryant]

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