If microsites are enabled and it is a microsite request, then take the microsite path for theming
Properly (de)serialize references in old mongo
LMS-11204
XML export maps keys into xml expected format
Merge pull request #4803 from edx/dhm/import_split_test

Dhm/import split test
Add ability to set staff lock from course outline
Merge pull request #4740 from edx/dan-ben/staff-lock-outline

Add ability to set staff lock from course outline
Fix Video Player Pause Issue
Bok-Choy CMS Video Editor Tests
Translation & secure-aware changes to studio's settings page

1. Change the link of course's about page secure aware, which displays 'https' or 'http' prefix according to the current protocol.
2. Make the email in this page translatable.
Merge pull request #4867 from louyihua/localization-cms

Translation & secure-aware changes to studio's settings page
Mark calls to track() on pageload as noninteraction events
Update comments to point to openedx.atlassian.net

And whitespace corrections (automatically made by my editor, and I'm too lazy
to remove them)
Added a relaunch invitation template email
Merge pull request #4865 from edx/ahodges/doc/DOC815

Added a relaunch invitation template email
Rewrite course url matcher to not be greedy
LMS-11181
Make it branch agnostic
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
Merge pull request #4878 from edx/dhm/split_branch_agnostic

Make it branch agnostic
Merge pull request #4877 from edx/dhm/course_id_pattern

Rewrite course url matcher to not be greedy
AUTHORS update
Fix messaging for professional ed under auto-registration