Fix bok_choy test by changing course separator.
Merge branch 'alex/edit_course_outline' of https://github.com/edx/edx-platform into alex/edit_course_outline