[Completes
Merge branch 'master' of https://github.com/GSA-OCSIT/mygov-account
Merge branch 'master' of https://github.com/GSA-OCSIT/mygov-account
[Completes #68371912] Migration for new grouping of scopes needs to include grandfathered scopes by updating their :scope_type attributes.