Merge "Fix sporadic failure for test_bgpvpn_migration" into mcp/yoga