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