Use a version of opaque keys that identifies version numbers in the key prefixes
Merge pull request #4537 from cpennington/new-locator-key-prefixes

Use a version of opaque keys that identifies version numbers in the key prefixes