Make Locators comply with UsageKey accessors

LMS-2421

Added block_type to definition and usage keys.
Changed serializers/deserializers to not have any slashes.
Reenabled disabled tests.

@nasthagiri @cpennington (delegate if you can't or don't want to review)