Revert "Switch from deprecated to new email scope"

This reverts commit b3ab5bd6bd776e47c2faba370ce5dd67fae2ad01.
Merge branch 'master' into latest-commits
Point to master
Use new OAuth2 scope code

Define GTM_OAUTH2_USES_OPENIDCONNECT so the code uses non-deprecated
scopes