Add trove_datastore and trove_datastore_version types

Change-Id: If739b4b26ef98ae9ba09affd4f2eeef4ad1b55fd
Merge "Add trove_datastore and trove_datastore_version types"