Flowerhack/merge ssck and cl

LMS-2858
And any other constructor parameters that we add to either CourseKey or OpaqueKey