Merge "[bgpvpn] Bring in L2/L3 VPN endpoints tests" into mcp/ussuri