Merge "Upgrade hazelcast version"