Merge pull request #10859 from edx/mushtaq/moment-requirejs-loading-fix

Load requirejs-config before module-js

lms/templates/main.html

@@ -79,7 +79,6 @@ from branding import api as branding_api
   % else:
     <%static:js group='main_vendor'/>
     <%static:js group='application'/>
-    <%static:js group='module-js'/>
   % endif
 
   <script>
@@ -92,6 +91,10 @@ from branding import api as branding_api
   </script>
   <script type="text/javascript" src="${static.url("lms/js/require-config.js")}"></script>
 
+  % if not disable_courseware_js:
+    <%static:js group='module-js'/>
+  % endif
+
   <%block name="headextra"/>
 
   <%static:optional_include_mako file="head-extra.html" with_microsite="True" />