Merge remote-tracking branch 'upstream/release' into select/rc

Conflicts:
	cms/djangoapps/contentstore/views/component.py
	cms/djangoapps/contentstore/views/tabs.py
	cms/envs/common.py
	cms/static/js/base.js
	cms/static/sass/assets/_fonts.scss
	cms/templates/settings.html
	cms/templates/widgets/units.html
	common/djangoapps/student/models.py
	common/djangoapps/student/views.py
	common/djangoapps/util/views.py
	common/lib/xmodule/xmodule/course_module.py
	common/lib/xmodule/xmodule/lti_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/combined_open_ended_modulev1.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/open_ended_module.py
	common/lib/xmodule/xmodule/open_ended_grading_classes/openendedchild.py
	common/lib/xmodule/xmodule/poll_module.py
	common/lib/xmodule/xmodule/templates/html/announcement.yaml
	common/lib/xmodule/xmodule/templates/problem/drag_and_drop.yaml
	common/lib/xmodule/xmodule/video_module.py
	common/static/coffee/src/discussion/discussion_module_view.coffee
	common/static/coffee/src/discussion/views/discussion_thread_list_view.coffee
	conf/locale/config
	i18n/extract.py
	lms/djangoapps/courseware/grades.py
	lms/djangoapps/instructor/views/instructor_dashboard.py
	lms/djangoapps/instructor/views/legacy.py
	lms/envs/aws.py
	lms/envs/common.py
	lms/static/coffee/src/staff_grading/staff_grading.coffee
	lms/static/sass/base/_font_face.scss
	lms/templates/combinedopenended/openended/open_ended_rubric.html
	lms/templates/courseware/course_about.html
	lms/templates/courseware/courses.html
	lms/templates/courseware/instructor_dashboard.html
	lms/templates/dashboard.html
	lms/templates/discussion/_discussion_module.html
	lms/templates/discussion/_underscore_templates.html
	lms/templates/discussion/_user_profile.html
	lms/templates/discussion/mustache/_inline_thread_show.mustache
	lms/templates/emails/enroll_email_allowedmessage.txt
	lms/templates/emails/unenroll_email_enrolledmessage.txt
	lms/templates/footer.html
	lms/templates/forgot_password_modal.html
	lms/templates/help_modal.html
	lms/templates/instructor/instructor_dashboard_2/send_email.html
	lms/templates/main.html
	lms/templates/navigation.html
	lms/templates/register.html
	lms/templates/static_templates/about.html
	lms/templates/static_templates/contact.html
	lms/templates/static_templates/help.html
	lms/templates/static_templates/press.html
	lms/templates/static_templates/privacy.html
	lms/templates/static_templates/tos.html
	lms/templates/stripped-main.html
	lms/templates/university_profile/edge.html