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

[Corey Bryant]

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