Merge pull request #1 from edx/db/harvardx

avoid URL rewriting
extend changes of url/raw issue to video annotions
Merge pull request #3782 from edx/jbau/shib-activate-on-acct-linking

Autoactivate inactive users on external_auth login
Merge pull request #3744 from lduarte1991/lduarte-harvardx

Reconnecting Token Generator for Annotation Tool [Fix]
Merge pull request #3762 from edx/clytwynec/bok-choy-auto_auth-page-fix

made is_browser_on_page actually check for the right page in AutoAuthPag...
added and updated pavelib/quality.py from dglance branch, deprecated rake quality tasks
Merge pull request #3775 from edx/clytwynec/bokchoy-language-test-fix

added check for modal to disappear in _change_lang_promise
Fix student progress @sarina bug
Merge pull request #3792 from edx/dhm/bug_ora_peer_grading

Fix student progress @sarina bug
create draft request gets already created version if it exists
STUD-1616
update _xmodule_recurse to ignore some exception
move upload code for assets to AssetsView
STUD-1523
update _xmodule_recurse method
Merge pull request #3712 from edx/jarv/cert-mode

returning enrollment mode for both active and inactive users
Merge pull request #3794 from edx/frances/fix/studio-edit-section-date-modal2

fix for modal appearing off-screen
Merge pull request #3767 from edx/zub/story/std1624-cmssubsectiontests

fix cms subsection tests
Anton's and Sylvia's edits
Merge pull request #3778 from cpennington/mixed-modulestore-bad-keys

Handle malformed keys in MixedModuleStore configuration
Merge pull request #3788 from cpennington/allow-cross-course-references

Allow cross course references in the LMS
Tolerance expressed in percentage now computes correctly. [BLD-522]