[Merge] ~chris.macnaughton/ubuntu/+source/neutron:bug/1885876 into ~ubuntu-server-dev/ubuntu/+source/neutron:master

[Corey Bryant]

Merged, thanks. We'll pick it up on the next upload.
-- 
https://code.launchpad.net/~chris.macnaughton/ubuntu/+source/neutron/+git/neutron/+merge/390280
Your team Ubuntu Server Developers is requested to review the proposed merge of ~chris.macnaughton/ubuntu/+source/neutron:bug/1885876 into ~ubuntu-server-dev/ubuntu/+source/neutron:master.