Merge "Use tenant_network if any in testcases after microversion v2.37"