Fixes for hazelcast 3
Update to version 2.1