Conflicts:
	common/djangoapps/external_auth/tests/test_shib.py
	common/djangoapps/external_auth/views.py
	common/djangoapps/student/views.py
	lms/envs/common.py
	lms/envs/test.py