Latest commits

Update our forked branch to the latest on master. In addition, use the `GTM_OAUTH2_USES_OPENIDCONNECT` preprocessor macro to turn on the gtm-oauth2 new scope code.