Merge "neutron-legacy: Remove no longer necessary vpnaas conditional"