[Merge] lp:~james-page/neutron/vpn-fwaas-fixes into lp:~ubuntu-server-dev/neutron/icehouse

[James Page]

James Page has proposed merging lp:~james-page/neutron/vpn-fwaas-fixes into lp:~ubuntu-server-dev/neutron/icehouse.

Requested reviews:
  Ubuntu Server Developers (ubuntu-server-dev)
Related bugs:
  Bug #1293632 in neutron (Ubuntu): "One Convergence NVSD plugin agent missing"
  https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1293632
  Bug #1298675 in neutron (Ubuntu): "VPN agent upstart configuration needs to reference l3_agent.ini"
  https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1298675
  Bug #1298676 in neutron (Ubuntu): "l3 agent should include fwaas_driver.ini"
  https://bugs.launchpad.net/ubuntu/+source/neutron/+bug/1298676

For more details, see:
https://code.launchpad.net/~james-page/neutron/vpn-fwaas-fixes/+merge/213221
-- 
https://code.launchpad.net/~james-page/neutron/vpn-fwaas-fixes/+merge/213221
Your team Ubuntu Server Developers is requested to review the proposed merge of lp:~james-page/neutron/vpn-fwaas-fixes into lp:~ubuntu-server-dev/neutron/icehouse.