Merge pull request #3702 from edx/will/opaque-keys-ora-fixes

Will/opaque keys ora fixes
Fix more broken tests after merge from master
Fix cms tests after merge from master
More ORA fixes for opaque-keys.
Fix improper parsing of location string
Compare stringified course_ids to regexes for courses allowed to execute unsafe code
Merge pull request #3699 from edx/flowerhack/fix-safe-exec

Compare stringified course_ids to regexes for courses allowed to execute...
Merge pull request #3709 from edx/fix-ora-errors

Some more places where we have ORA errors
More missing ORA fixes.
returning enrollment mode for both active and inactive users
Address review comments
Merge pull request #3713 from edx/fix-ora-errors

More missing ORA fixes.
Fix failing mongo modulestore unit tests
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master
Merge remote-tracking branch 'edx/opaque-keys' into opaque-keys-merge-master
Add ADDL_INSTALLED_APPS to studio for parity with lms
Merge pull request #3711 from edx/flowerhack/fix-subhist

Fix improper parsing of location string
Fix spoc_gradebook
Merge remote-tracking branch 'edx/master' into opaque-keys-merge-master

Conflicts:
	lms/djangoapps/courseware/tests/test_views.py
	lms/djangoapps/instructor/tests/test_api.py
	lms/djangoapps/instructor/tests/test_legacy_anon_csv.py
	lms/djangoapps/instructor/views/api.py
	lms/djangoapps/instructor/views/legacy.py
Fix merge conflicts