Merge "Fix for test_cross_tenant_traffic failed" into mcp/xenial/rocky