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

[Corey Bryant]

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