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

[Corey Bryant]

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