Conflicts: lms/djangoapps/student_account/test/test_views.py lms/djangoapps/student_account/urls.py lms/djangoapps/student_account/views.py
