Merge "Fix test_authentication_when_tenant_is_disabled"