This reverts commit 7ee7093b.

Conflicts:
	common/djangoapps/third_party_auth/pipeline.py
	common/djangoapps/third_party_auth/settings.py
	common/djangoapps/third_party_auth/strategy.py
	common/djangoapps/third_party_auth/tests/specs/test_testshib.py
	common/djangoapps/third_party_auth/tests/test_strategy.py
	lms/envs/aws.py
	lms/envs/test.py