Merge pull request #18682 from edx/jmbowman/TE-2524

common/djangoapps/course_modes/tests/test_views.py

common/djangoapps/django_comment_common/tests.py

common/djangoapps/enrollment/tests/test_views.py

common/djangoapps/student/tests/test_enrollment.py

common/djangoapps/student/tests/test_recent_enrollments.py

common/djangoapps/student/tests/test_verification_status.py

common/djangoapps/student/tests/tests.py

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

common/lib/capa/capa/safe_exec/tests/test_safe_exec.py

...module/modulestore/perf_tests/test_asset_import_export.py

.../lib/xmodule/xmodule/modulestore/tests/test_assetstore.py

...modulestore/tests/test_cross_modulestore_import_export.py

...odule/xmodule/modulestore/tests/test_mixed_modulestore.py

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

.../xmodule/xmodule/modulestore/tests/test_split_migrator.py

...odule/xmodule/modulestore/tests/test_split_modulestore.py

...odule/xmodule/modulestore/tests/test_split_w_old_mongo.py

...est/acceptance/tests/discussion/test_cohort_management.py

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

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