Make it branch agnostic
LMS-11210

Conflicts:
	common/lib/xmodule/xmodule/modulestore/split_mongo/split_draft.py
Rewrite course url matcher to not be greedy
LMS-11181
Merge pull request #4836 from edx/reruns/branch_lms

Reruns/branch lms