[NUCHBASE-91] Clean up handling of versioning