Merge "Remove force_tenant_isolation=True from test that doesn't need it"