Merge "Update of mapping neutron port to vpp endpoint"