Merge pull request #15265 from edx/ret/upsell-cookie

lms/djangoapps/ccx/tests/test_field_override_performance.py

lms/djangoapps/courseware/date_summary.py

lms/djangoapps/courseware/tests/test_course_info.py

lms/djangoapps/courseware/tests/test_date_summary.py

lms/djangoapps/courseware/tests/test_views.py

lms/djangoapps/courseware/views/index.py

lms/djangoapps/courseware/views/views.py

lms/djangoapps/discussion/views.py

lms/templates/courseware/info.html

lms/templates/courseware/upgrade.html

lms/templates/main.html

...eatures/course_experience/tests/views/test_course_home.py

...ures/course_experience/tests/views/test_course_updates.py

openedx/features/course_experience/views/course_outline.py

pavelib/utils/test/suites/suite.py

scripts/generic-ci-tests.sh