Merge pull request #8024 from edx/feature/SOL-276

cms/djangoapps/contentstore/courseware_index.py

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/test_course_settings.py

cms/djangoapps/contentstore/views/course.py

cms/djangoapps/models/settings/course_details.py

cms/djangoapps/models/settings/course_metadata.py

cms/envs/common.py

cms/static/js/models/settings/course_details.js

cms/static/js/spec/views/settings/main_spec.js

cms/static/js/views/settings/main.js

cms/templates/js/mock/mock-settings-page.underscore

cms/templates/settings.html

common/lib/xmodule/xmodule/course_module.py