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

[Corey Bryant]

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