Merge "_get_tenant_by_name doesn't return correctly"