Merge pull request #14320 from edx/release-candidate

cms/djangoapps/contentstore/tests/test_transcripts_utils.py

cms/static/js/spec/video/transcripts/utils_spec.js

cms/static/js/views/video/transcripts/utils.js

cms/templates/container.html

common/djangoapps/util/tests/test_submit_feedback.py

common/djangoapps/util/views.py

common/lib/capa/capa/inputtypes.py

common/lib/capa/capa/templates/formulaequationinput.html

common/lib/capa/capa/templates/textline.html

common/lib/capa/capa/tests/test_inputtypes.py

common/lib/xmodule/xmodule/modulestore/tests/factories.py

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

...common/js/discussion/views/discussion_thread_list_view.js

.../spec/discussion/view/discussion_thread_list_view_spec.js

...c/common/templates/discussion/thread-list-item.underscore

common/test/acceptance/tests/helpers.py

...tatic/discussion/js/views/discussion_user_profile_view.js

...4_emailmarketingconfiguration_welcome_email_send_delay.py

lms/djangoapps/email_marketing/models.py

lms/djangoapps/email_marketing/tasks.py