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.

Use css_has_value() to fix failure in course-overview.feature

base.js requires jquery.smoothScroll

Use pre-generated reports for pep8/pylint when running diff-quality

Update docs readme

Model tests for verify_student flow.

Jkarni/feature/import feedback

    And fixes for rebase-breakage.

disable buttons for legacy and beta instr dash

Fix navigation and grading acceptance tests

LMS: adds message styling to the separate instructor_2 Sass file

set max enrollment for downloads to 200

Studio: adds in instructional copy to user on when it is safe to leave the import view without harming an import process

Studio: revises import help/status copy to better reflect/generalize what is done with imported content

Add test cases for import status