[Merge] lp:~corey.bryant/ubuntu/vivid/neutron-vpnaas/2015.1.1 into lp:ubuntu/vivid-updates/neutron-vpnaas

[Corey Bryant]

I've uploaded this to the archive and will let the Package Import Robot commit the branch changes.
-- 
https://code.launchpad.net/~corey.bryant/ubuntu/vivid/neutron-vpnaas/2015.1.1/+merge/266899
Your team Ubuntu Development Team is requested to review the proposed merge of lp:~corey.bryant/ubuntu/vivid/neutron-vpnaas/2015.1.1 into lp:ubuntu/vivid-updates/neutron-vpnaas.