Flowerhack/merge ssck and cl

LMS-2858
Yeah I don't see why we'll need `LocationBase` - `BlockUsageLocator` will not need it, and I'm assuming we'll need to similarly make `AssetLocation` an `AssetLocator` inheriting from `BlockLocatorBase` rather than `LocationBase`