Merge "Use network from get_tenant_network in scenario"