There were previous merge conflicts in the file.

When auto-show/auto-hide is disabled, the captions will be shown when
the user will move the mouse over the "CC" button. They will then
auto-hide after a while if the user doesn't continue to move the
mouse over the "CC" button, or over the captions themselves, or use
the keyboard to select a specific caption. If the mouse pointer is not
over the captions or the "CC" button, they will hide after a while.

This is the key in the fix for bug BLD-355: Transcript hovers over
over videoplayer itself for PKU videos.

Front-end functionality was not removed. When flag is set to "True", old
behaviour of autohiding of controls and captions will be enabled.

Signed-off-by: Julian Arni <julian@edx.org>

when draft is deleted and then parent published.
ensure moving doesn't cause deletion

First pass at ARIA. Video player buttons announce themselves as button when used with a screen reader

We aren't ready to use XBlock.load_class, there are duplicate entry point names, and simply choosing the first one leads to unpredictability.