Rebase with master.

Update to newer API. Do not directly implement KeyColumValueStore, but rather OrderedKeyValueStore.