Merge pull request #2071 from raydavis/raywip

CLC-2425 Instructor section nesting by Course Option
CLC-3207 Missing bCourses section links with unprefixed CCN strings