Merge pull request #11438 from edx/clrux/ac-329

cms/envs/common.py

cms/static/cms/js/require-config.js

cms/static/coffee/spec/main.coffee

cms/static/coffee/spec/main_squire.coffee

cms/static/js_test.yml

common/lib/xmodule/xmodule/css/video/display.scss

common/lib/xmodule/xmodule/html_module.py

common/lib/xmodule/xmodule/js/js_test.yml

common/lib/xmodule/xmodule/js/spec/main_requirejs.js

common/lib/xmodule/xmodule/js/src/video/09_video_caption.js

common/static/common/js/spec/main_requirejs.js

common/static/js/vendor/afontgarde/afontgarde.css

common/static/js/vendor/afontgarde/afontgarde.js

common/static/js/vendor/afontgarde/edx-icons.js

.../vendor/afontgarde/modernizr.fontface-generatedcontent.js

common/static/js/vendor/draggabilly.js

common/static/js_test.yml

common/test/acceptance/tests/video/test_video_module.py

lms/envs/common.py

lms/static/js/spec/main.js