Merge "Respect auth.allow_tenant_isolation"