Merge pull request #10043 from edx/revert-9934-usman/use-included-staticfiles-app

Revert "Upgrade django-pipeline and staticfiles"

openedx/core/djangoapps/credit/email_utils.py

@@ -12,7 +12,7 @@ import HTMLParser
 
 from django.conf import settings
 from django.contrib.auth.models import User
-from django.contrib.staticfiles import finders
+from staticfiles import finders
 from django.core.cache import cache
 from django.core.mail import EmailMessage
 from django.core.urlresolvers import reverse

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

@@ -6,7 +6,7 @@ import hashlib
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.core.files.storage import get_storage_class
-from django.contrib.staticfiles.storage import staticfiles_storage
+from staticfiles.storage import staticfiles_storage
 
 from microsite_configuration import microsite