[Merge] ~mylesjp/ubuntu/+source/manila:master into ~ubuntu-openstack-dev/ubuntu/+source/manila:master

[Myles Penner]

RabbitMQ issue seen elsewhere. Only present due to race condition on this infra.
-- 
https://code.launchpad.net/~mylesjp/ubuntu/+source/manila/+git/manila/+merge/493633
Your team Ubuntu OpenStack uploaders is requested to review the proposed merge of ~mylesjp/ubuntu/+source/manila:master into ~ubuntu-openstack-dev/ubuntu/+source/manila:master.