Merge pull request #1854 from MITx/fix/cdodge/violation-fixes

cms/djangoapps/contentstore/course_info_model.py

cms/djangoapps/contentstore/module_info_model.py

cms/djangoapps/contentstore/utils.py

cms/djangoapps/contentstore/views.py

cms/djangoapps/models/settings/course_details.py

cms/djangoapps/models/settings/course_grading.py

cms/djangoapps/models/settings/course_metadata.py

cms/envs/aws.py

cms/envs/common.py

common/lib/xmodule/xmodule/abtest_module.py

common/lib/xmodule/xmodule/annotatable_module.py

common/lib/xmodule/xmodule/combined_open_ended_module.py

common/lib/xmodule/xmodule/conditional_module.py

common/lib/xmodule/xmodule/contentstore/content.py

common/lib/xmodule/xmodule/contentstore/django.py

common/lib/xmodule/xmodule/contentstore/mongo.py

common/lib/xmodule/xmodule/course_module.py

common/lib/xmodule/xmodule/discussion_module.py

common/lib/xmodule/xmodule/error_module.py

common/lib/xmodule/xmodule/exceptions.py