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

[Corey Bryant]

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