Original changes found in this commit https://github.com/edx/edx-platform/commit/a6bae4d238fdc6a60c8ee9f1b80ca 3512bb085eb Conflicts: common/lib/xmodule/xmodule/textannotation_module.py common/lib/xmodule/xmodule/videoannotation_module.py
