Changed timeout to see if that solves problem in jdk8 with the ExecutorServiceTest
Merge branch 'master' of github.com:hazelcast/hazelcast