… into get-delete-external-ids

* 'master' of https://github.com/CenterForOpenScience/osf.io: (27 commits)
  Update entity id / login url for IIT
  Add institution Illinois Institute of Technology (IIT)
  Update CHANGELOG, package.json
  Allow "upload" action to registrations being archived
  Fix institutions order in `scripts/populate_institutions.py`
  Add new institution CMU to test server only
  Fix None subjects bug
  Add 'provider' to ES CGM docs
  fix prob fail for TestNodeDetail.test_node_shows_wiki_relationship_based_on_disabled_status_and_version
  Add SearchParser - update perms and views
  Add test for expected search POST behavior
  Remove deprecated kwarg -Breaking change from "master"
  Update changed method signatures -Broke with "master" changes
  Add merge migration
  Remove duplicative Addr/Privacy info -Already in base template -Also fix <br/> tag
  Add form validation for asset naming conflicts
  Include comment in "edit-comment" email
  Add Choices to ProviderAssetFile.name
  Add merge migration
  Prevent outgoing blob requests when getting URLs
  ...

 into get-delete-external-ids

* 'develop' of https://github.com/CenterForOpenScience/osf.io:
  Integrate django-silk for profiling
  avoid failure on coveralls client
  add code coverage to tests

 into get-delete-external-ids

* 'develop' of https://github.com/CenterForOpenScience/osf.io: (98 commits)
  Bump version and update changelog
  fix tests for non-dict based client attributes
  Update gitlab serializers for fangorn config js
  Add enforce_csrf waffle switch so that this can be merged earlier
  Update markdown-it-video with infinite loop fix
  Fix indentation
  Improve tests by using user cookie method and faster user creation
  Tests to ensure API requests with Session auth fail without CSRF protection
  Travis and Test Speed ups
  Rename --quick to --all
  Don't transact to avoid deadlocks
  Add script to fix poor mapping logic -h/t @caseyrollins
  Add same enforce_csrf method as drf's SessionAuthentication
  replace bad reverse migration with warning
  Use timezone.now() when checking for failed registrations
  Remove duplicate psyarxiv custom subject.
  Use fork of celery 4.2.1 with celery/celery#4839 merged
  Upgrade celery and kombu
  Set TIME_ZONE in settings
  add scheme to match UI
  ...

… into get-delete-external-ids

* 'master' of https://github.com/CenterForOpenScience/osf.io:

 into get-delete-external-ids

* 'develop' of https://github.com/CenterForOpenScience/osf.io:
  fix mocking for gitlab

 into get-delete-external-ids

* 'develop' of https://github.com/CenterForOpenScience/osf.io:
  Allow removing stuck registrations with addons
  Add write scopes instead of read scopes to write-only user endpoints.
  Add USER_SETTINGS scopes, mock send_email in throttling tests, and move user fixtures out so they can be shared between tests.
  Handle account export and deactivation requests in APIv2.

Signed-off-by: John Tordoff <john@cos.io>

# Conflicts:
#	api/users/serializers.py
#	api/users/urls.py
#	api/users/views.py

Signed-off-by: John Tordoff <john@cos.io>

Signed-off-by: John Tordoff <john@cos.io>