More work on hazelcast version control