Fix 500 we're seeing on password reset confirm page

Just a simple missing import on the mako template.

-Moved answer-pool attribute down to <choicegroup>
-Refactored the randomization, requiring a lot of
updated tests :(

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

Conflicts:
	CHANGELOG.rst

* some more tests

* make preview work with shib classes

* Styled unauth access button and banner.
  - renamed "preview" button to "Explore Course" and styled.
  - moved banner from main navigation to course navigation.
  - moved span tag inside link to make clickable area larger

Conflicts:
	common/djangoapps/student/tests/factories.py
	common/djangoapps/student/views.py
	lms/djangoapps/courseware/tests/test_access.py

Update 12/3 RC branch with the part of the hotfix we want permanently.

modify partial recovery message

into beta dashboard.

Also includes new functionality, in both legacy and beta
dashboard, to include appropriate email text for a
Shibboleth course.

Conflicts:
	lms/djangoapps/instructor/tests/test_api.py

This reverts commit e987b11d.

Inserted by @jrbl and @caesar2164 on behalf of @dcadams.

Ned/merge lti hotfix

Add recovery command

Conflicts:
	common/lib/xmodule/xmodule/lti_module.py

Fixes to database columns

adds more temporary error messages

Hotfix/error msg ora panel

STUD-1008

Part of STUD-870

LTI: Add display name.