returning enrollment mode for both active and inactive users
Revert "Revert pull request #3466"

This reverts commit 59e3cae4c9c6f2c95a816a8280b470ec6add9486.
Fix for 500 error (undefined) in annotation tool
Added rst version of cognitive load page
add So You Want to Deploy a New Service
create course gorups properly on course import
STUD-1595
Skip language changing tests
address review comments from @nedbat
renamed cognitive_load.rst to code-considerations.rst
Merge pull request #3756 from edx/zoldak/disable-flaky-test

Skip language changing tests
Merge pull request #3640 from edx/zub/bugfix/std1595-importcoursepermission

remove redundent code on course import
disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block
Update Video docs to reflect new UI
Merge pull request #3740 from edx/sylvia/docs/BLD-1032

Update Video component to reflect new UI
Merge pull request #3758 from edx/clytwynec/disable-XBlockAcidNoChildTest

disabled test_lms.py:XBlockAcidNoChildTest.test_acid_block
link to code considerations page from contributor doc
Merge pull request #3752 from edx/db/doc-cognitive-load

Added rst version of cognitive load page
Using Edx version of tinymce
made is_browser_on_page actually check for the right page in AutoAuthPage
Use local storage instead of S3 for uploads in devstack.