Merge pull request #1142 from MITx/feature/dhm/cms-settings

fix up some test failures

cms/djangoapps/contentstore/tests/test_course_settings.py

@@ -9,7 +9,7 @@ from xmodule.modulestore import Location
 from cms.djangoapps.models.settings.course_details import CourseDetails,\
     CourseSettingsEncoder
 import json
-from common.djangoapps.util import converters
+from util import converters
 import calendar
 
 # YYYY-MM-DDThh:mm:ss.s+/-HH:MM