Merge pull request #4832 from edx/hotfix/2014-08-14

cms/djangoapps/contentstore/features/common.py

...ontentstore/features/component_settings_editor_helpers.py

cms/envs/common.py

cms/templates/base.html

common/djangoapps/edxmako/shortcuts.py

common/djangoapps/edxmako/template.py

common/djangoapps/edxmako/tests.py

common/lib/xmodule/xmodule/imageannotation_module.py

...modulestore/tests/test_cross_modulestore_import_export.py

common/lib/xmodule/xmodule/textannotation_module.py

common/lib/xmodule/xmodule/videoannotation_module.py

common/static/js/vendor/ova/catch/js/catch.js

common/static/js/vendor/ova/ova.js

lms/envs/aws.py

lms/envs/common.py

lms/templates/imageannotation.html

lms/templates/textannotation.html

lms/templates/videoannotation.html

lms/templates/widgets/optimizely.html

requirements/edx/github.txt