[CLC-1402] Adding mail into the OAuth scope

JIRA: https://jira.media.berkeley.edu/jira/browse/CLC-1402

Will be one coming in for the qa branch as well.