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

[Corey Bryant]

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