Merge "Fixes BgpVpn service name and tht fixes"