Merge branch 'master' into feature/abarrett/annotatable_xmodule

cms/djangoapps/contentstore/tests/test_contentstore.py

cms/djangoapps/contentstore/tests/test_course_settings.py

cms/djangoapps/contentstore/tests/tests.py

cms/djangoapps/models/settings/course_grading.py

cms/static/js/views/settings/main_settings_view.js

common/lib/capa/capa/responsetypes.py

common/lib/xmodule/xmodule/course_module.py

common/lib/xmodule/xmodule/templates.py

common/lib/xmodule/xmodule/timelimit_module.py

lms/djangoapps/courseware/views.py

lms/envs/common.py

lms/envs/dev_edx4edx.py

lms/envs/edx4edx_aws.py

lms/lib/dogfood/README.md

lms/lib/dogfood/__init__.py

lms/lib/dogfood/check.py

lms/lib/dogfood/views.py

lms/templates/courseware/courseware.html

lms/templates/dogfood.html

lms/templates/gitupdate.html