Merge branch 'master' into feature/abarrett/lms-notes-app

cms/djangoapps/contentstore/management/commands/update_templates.py

@@ -1,4 +1,5 @@
 from xmodule.templates import update_templates
+from xmodule.modulestore.django import modulestore
 from django.core.management.base import BaseCommand
 
 
@@ -6,4 +7,4 @@ class Command(BaseCommand):
     help = 'Imports and updates the Studio component templates from the code pack and put in the DB'
 
     def handle(self, *args, **options):
-        update_templates()
+        update_templates(modulestore('direct'))

cms/djangoapps/contentstore/tests/test_contentstore.py

@@ -937,7 +937,7 @@ class TemplateTestCase(ModuleStoreTestCase):
         self.assertIsNotNone(verify_create)
 
         # now run cleanup
-        update_templates()
+        update_templates(modulestore('direct'))
 
         # now try to find dangling template, it should not be in DB any longer
         asserted = False