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

[Corey Bryant]

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