Merge pull request #7426 from edx/adam/merge-release-to-master

common/djangoapps/performance/__init__.py

common/djangoapps/performance/tests/__init__.py

common/djangoapps/performance/tests/test_logs.py

common/djangoapps/performance/views/__init__.py

common/lib/xmodule/xmodule/video_module/video_module.py

lms/djangoapps/courseware/tests/test_video_mongo.py

lms/djangoapps/instructor/views/api.py

lms/djangoapps/instructor_task/tasks.py

lms/djangoapps/instructor_task/tasks_helper.py

lms/envs/aws.py

lms/envs/common.py

lms/templates/video.html

lms/urls.py