[Merge] ~seyeongkim/ubuntu/+source/neutron:lp2072154_master into ~ubuntu-openstack-dev/ubuntu/+source/neutron:master

[James Page]

Review: Disapprove

This commit was included in the snapshots uploaded to oracular development last week.
-- 
https://code.launchpad.net/~seyeongkim/ubuntu/+source/neutron/+git/neutron/+merge/471136
Your team Ubuntu OpenStack uploaders is subscribed to branch ~ubuntu-openstack-dev/ubuntu/+source/neutron:master.