Conflicts: CHANGELOG.rst common/djangoapps/mitxmako/middleware.py common/djangoapps/student/models.py common/djangoapps/student/tests/factories.py common/djangoapps/student/views.py common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py lms/djangoapps/courseware/courses.py lms/djangoapps/courseware/tests/test_access.py lms/djangoapps/courseware/tests/test_courses.py lms/djangoapps/courseware/tests/test_module_render.py lms/djangoapps/instructor/tests/test_api.py lms/djangoapps/instructor/views/instructor_dashboard.py lms/djangoapps/instructor/views/legacy.py lms/djangoapps/shoppingcart/models.py lms/envs/aws.py lms/templates/dashboard/_dashboard_course_listing.html lms/templates/main_django.html lms/templates/registration/password_reset_complete.html lms/urls.py
