Merge pull request #6208 from edx/clintonb/release-fix

Corrected Import Statement

common/djangoapps/third_party_auth/pipeline.py

@@ -101,7 +101,7 @@ from . import provider
 # `AUTH_ENROLL_COURSE_ID_KEY` provides the course ID that a student
 # is trying to enroll in, used to generate analytics events
 # and auto-enroll students.
-from user_api.api import profile
+from openedx.core.djangoapps.user_api.api import profile
 
 AUTH_ENTRY_KEY = 'auth_entry'
 AUTH_REDIRECT_KEY = 'next'

common/djangoapps/third_party_auth/tests/test_change_enrollment.py

@@ -19,7 +19,7 @@ from student.models import CourseEnrollment
 from xmodule.modulestore.tests.django_utils import (
     ModuleStoreTestCase, mixed_store_config
 )
-from user_api.models import UserOrgTag
+from openedx.core.djangoapps.user_api.models import UserOrgTag
 
 
 MODULESTORE_CONFIG = mixed_store_config(settings.COMMON_TEST_DATA_ROOT, {}, include_xml=False)