Merge pull request #12015 from edx/cdyer/broken-master-20160401

Fix broken import due to merging oauth changes to master

lms/djangoapps/learner_dashboard/tests/test_programs.py

@@ -10,7 +10,7 @@ from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
 from django.test import override_settings
-from oauth2_provider.tests.factories import ClientFactory
+from edx_oauth2_provider.tests.factories import ClientFactory
 from opaque_keys.edx import locator
 from provider.constants import CONFIDENTIAL