Fix up hazelcast cluster logic for 3.x