[Merge] ~zhhuabj/ubuntu/+source/octavia:oracular_dev into ~ubuntu-openstack-dev/ubuntu/+source/octavia:master

[James Page]

Review: Disapprove

This commit will be included in the snapshot for Dalmatian that is currently in-progress.
-- 
https://code.launchpad.net/~zhhuabj/ubuntu/+source/octavia/+git/octavia/+merge/471140
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/octavia:master.