Replaced pyelasticsearch with elasticsearch-py client, and merged develop
Fix overwritten changes from merge conflict
>.> flake8
Update requirements
Merge branch 'feature/search/elasticsearch-py' of https://github.com/fabianvf/osf into feature/search/elasticsearch-py
legacy routes for osffiles api file downloads, tests to ensure they redirect to new osfstorage platform
Merge branch 'master' of github.com:CenterForOpenScience/osf.io into hotfix/legacy-osffiles-api-routes
Better iteration pattern for dictionaries
Cleaned up imports and removed debug statements
Merge branch 'hotfix/0.21.18'
Handle queued tasks when working outside request context.
Improve logging; add missing main block.
Remove log-silencing import side-effect.
Merge branch 'hotfix/0.21.19'
Merge branch 'hotfix/0.21.19' into develop
Merge branch 'hotfix/0.21.20'
Merge branch 'hotfix/0.21.20' into develop
Fix node_scale method to handle deleted parent projects

Fixes https://sentry.osf.io/osf/production/group/1119/
Merge branch 'hotfix/0.21.21' into develop
Fix node_scale method to handle deleted parents

fixes https://sentry.osf.io/osf/production/group/1119/