Fix #386 and #385
Merge pull request #387 from hazelcast/fix/assertTrueEventually-improvements

AssertTrueEventually improvements