Merge branch 'hotfix/empty-private-repos'
Refactor the endpoint for list S3 files
Refactor the S3 url builder to use url_for functions
Merge branch 'master' of https://github.com/CenterForOpenScience/osf into hotfix/s3-keys
Allow for nested paths
Update tests
Naming fix for nested folders
Use rstrip rather than ifs h/t @sloria
Add alert if user attempts to create a wiki page with forward slashes in the name.
Remove console.log statement
Begin endpoints for glacier metadata.

Tests to follow.
Test metadata logic in models and views.
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io into feature/osf-storage-glacier
Default SENTRY_DSN to None

...to avoid instantiating a Sentry client in local environments

[skip ci]
Merge branch 'hotfix/0.21.12' into develop
Merge branch 'release/0.21.12' into develop
Merge branch 'develop' of https://github.com/CenterForOpenScience/osf.io into hotfix/s3-keys

Conflicts:
	website/addons/s3/utils.py
Merge branch 'feature/osf-storage-glacier' into develop
Make error message color and position consistent with rest of site
Merge branch 'feature/wiki-naming' into develop