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

[Corey Bryant]

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