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

[Corey Bryant]

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