merged with master

move slash base course id logic in get_course_key