Conflicts: cms/djangoapps/contentstore/views/course.py common/lib/xmodule/xmodule/tests/test_combined_open_ended.py lms/envs/common.py
