Merge branch 'release'

cms/djangoapps/contentstore/views/videos.py

cms/envs/test.py

cms/templates/videos_index.html

common/djangoapps/embargo/models.py

common/djangoapps/embargo/tests/test_api.py

common/djangoapps/oauth_exchange/__init__.py

common/djangoapps/oauth_exchange/forms.py

common/djangoapps/oauth_exchange/models.py

common/djangoapps/oauth_exchange/tests/__init__.py

common/djangoapps/oauth_exchange/tests/test_forms.py

common/djangoapps/oauth_exchange/tests/test_views.py

common/djangoapps/oauth_exchange/tests/utils.py

common/djangoapps/oauth_exchange/views.py

common/djangoapps/track/shim.py

common/djangoapps/track/views/tests/test_segmentio.py

common/test/acceptance/pages/lms/discussion.py

common/test/acceptance/tests/discussion/helpers.py

common/test/acceptance/tests/discussion/test_cohorts.py

common/test/acceptance/tests/discussion/test_discussion.py

lms/djangoapps/course_structure_api/v0/tests.py