Merge "BUG-509: remove the key/value datastore"