Merge pull request #2548 from edx/diana/drupal-registration-i18n

Don't internationalize strings we use for enrollment.
BLD-824: Download Video link missing from video player.
Merge pull request #2554 from edx/anton/fix-video-import

Video: Fix for Download Video link.
BLD-811: Revert functionality.
Merge pull request #2557 from edx/anton/revert-download-transcript-rc

Video: Revert Download transcript button behavior.
failing test for xblock_handler
STUD-1311
Fix STUD-1311 (Don't overwrite published content w/ draft content accidentally)
Merge pull request #2573 from cpennington/zub/bugfix/std1311-changestodraft

Fix for STUD-1311
Merge branch 'release'