map tested (and fixed) on 2.4 HazelcastTest
Merge remote-tracking branch 'origin/3.0' into 3.0