Merge "Fix test_authentication_with_invalid_tenant"