Merge "Correct invalid client in ServersNegativeTestMultiTenantJSON"