Merge develop into feature/es2-consolidation feature branch#997

adlius merged 5 commits into

feature/es2-consolidationCenterForOpenScience/angular-osf:feature/es2-consolidationfrom

developCenterForOpenScience/angular-osf:developCopy head branch name to clipboard