Merge pull request #5383 from edx/will/account-and-profile-rebase

common/djangoapps/student/models.py

common/djangoapps/third_party_auth/pipeline.py

common/djangoapps/third_party_auth/settings.py

common/djangoapps/third_party_auth/tests/test_settings.py

common/djangoapps/user_api/api/__init__.py

common/djangoapps/user_api/api/account.py

common/djangoapps/user_api/api/profile.py

common/djangoapps/user_api/helpers.py

common/djangoapps/user_api/models.py

common/djangoapps/user_api/tests/test_account_api.py

common/djangoapps/user_api/tests/test_helpers.py

common/djangoapps/user_api/tests/test_profile_api.py

lms/djangoapps/student_account/__init__.py

lms/djangoapps/student_account/test/__init__.py

lms/djangoapps/student_account/test/test_views.py

lms/djangoapps/student_account/urls.py

lms/djangoapps/student_account/views.py

lms/djangoapps/student_profile/__init__.py

lms/djangoapps/student_profile/test/__init__.py

lms/djangoapps/student_profile/test/test_views.py