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

[Corey Bryant]

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