Merge "Hybrid OpenID/OAuth: Check for session validity during logout" into stable-2.10