Clean up autodiscover

cms/urls.py

@@ -2,11 +2,11 @@ from django.conf import settings
 from django.conf.urls import include, patterns, url
 from django.conf.urls.static import static
 from django.contrib import admin as django_admin
-
 from ratelimitbackend import admin
 
 from cms.djangoapps.contentstore.views.organization import OrganizationListView
 
+
 django_admin.autodiscover()
 
 # Pattern to match a course key or a library key

lms/urls.py

@@ -6,9 +6,10 @@ from config_models.views import ConfigurationModelCurrentAPIView
 from django.conf import settings
 from django.conf.urls import include, patterns, url
 from django.conf.urls.static import static
+from django.contrib.admin import autodiscover as django_autodiscover
 from django.views.generic.base import RedirectView
 from ratelimitbackend import admin
-from django.contrib.admin import autodiscover as django_autodiscover
+
 from courseware.views.index import CoursewareIndex
 from courseware.views.views import CourseTabView, EnrollStaffView, StaticCourseTabView
 from django_comment_common.models import ForumsConfig
@@ -20,7 +21,8 @@ from openedx.core.djangoapps.site_configuration import helpers as configuration_
 from openedx.features.enterprise_support.api import enterprise_enabled
 
 
-django_autodiscover()
+if settings.DEBUG or settings.FEATURES.get('ENABLE_DJANGO_ADMIN_SITE'):
+    django_autodiscover()
 
 # Use urlpatterns formatted as within the Django docs with first parameter "stuck" to the open parenthesis
 urlpatterns = (