Some last code cleanup according to changes in other test packages (see #2983).
Merge branch 'master' of https://github.com/Donnerbart/hazelcast into fixFor2950