hazelcast/hazelcast — pull request #2657 by eminn (2014-06-09 14:22:17+00:00)
Title: fixes #2539

forward port changes from #2539