Merge branch 'release'

cms/djangoapps/contentstore/views/tests/test_videos.py

cms/djangoapps/contentstore/views/videos.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/certificates/queue.py

lms/djangoapps/certificates/tests/test_queue.py

lms/djangoapps/django_comment_client/base/tests.py

lms/djangoapps/django_comment_client/base/views.py

lms/djangoapps/django_comment_client/forum/tests.py

lms/djangoapps/django_comment_client/forum/views.py

lms/djangoapps/django_comment_client/tests/test_utils.py

lms/djangoapps/django_comment_client/tests/utils.py

lms/djangoapps/django_comment_client/utils.py

lms/envs/common.py

lms/envs/test.py

lms/urls.py