Merge "Rename list_users_for_tenant to list_tenant_users"