Merge "Support hybrid OpenID and OAuth2 authentication" into stable-2.10