Fix angular upgrade merge conflicts#953

brianjgeiger merged 23 commits into

CenterForOpenScience:feature/angular-upgradeCenterForOpenScience/angular-osf:feature/angular-upgradefrom

nsemets:fix/angular-upgrade-merge-conflictsnsemets/angular-osf:fix/angular-upgrade-merge-conflictsCopy head branch name to clipboard