Merge pull request #17561 from edx/jmbowman/PLAT-1976

cms/envs/common.py

common/djangoapps/student/apps.py

common/djangoapps/student/signals/receivers.py

common/djangoapps/student/tests/test_activate_account.py

common/djangoapps/student/tests/test_create_account.py

common/djangoapps/student/tests/test_email.py

common/djangoapps/student/tests/test_login.py

common/djangoapps/student/tests/test_reset_password.py

common/djangoapps/student/views/management.py

lms/envs/common.py

lms/templates/email_change_failed.html

openedx/core/djangoapps/user_api/accounts/api.py

openedx/core/djangoapps/user_api/accounts/tests/test_api.py

openedx/core/djangoapps/user_api/config/__init__.py

openedx/core/djangoapps/user_api/config/waffle.py