Split/branch settings LMS-11056

Merge of this PR https://github.com/edx/edx-platform/pull/4514 into master.
2 spaces?