[Merge] ~zioproto/ubuntu/+source/neutron:stable/liberty into ~ubuntu-server-dev/ubuntu/+source/neutron:stable/liberty

[Saverio Proto]

Hello,
the upstream patch is merged. I just pushed a refreshed commit in my tree, and this merge request got automatically updated.
thank you
-- 
https://code.launchpad.net/~zioproto/ubuntu/+source/neutron/+git/neutron/+merge/309457
Your team Ubuntu Server Developers is subscribed to branch ~ubuntu-server-dev/ubuntu/+source/neutron:stable/liberty.