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

[Corey Bryant]

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