Cherry-pick by Joe Blaylock <jrbl@stanford.edu> into our rc with
fixups to test file; I don't know how all the indentation got broken.

Conflicts:
	common/djangoapps/student/tests/test_password_policy.py