Flowerhack/merge ssck and cl

LMS-2858
`_from_string` shouldn't be handling both the deprecated and not-deprecated cases. It should only handle parsing the new style format (as covered by parse_url).

The deprecated org/course/run format should be handled in the `_from_deprecated_string` method.