Merge "no force_tenant_isolation in DefaultDomainTestJSON"