Split branch settings LMS-11056
Split branch settings code review fixes LMS-11056
Merge pull request #4532 from edx/split/branch-settings

Split/branch settings LMS-11056