Resolved CompletableFuture conflict
Merge branch 'master' of https://github.com/hazelcast/hazelcast