Merge "Added dependency on neutron to vpnservice jjb"