STASHDEV-7788 Cherry pick some changes from https://github.com/atlassian/hazelcast/pull/22
Merge pull request #23 from atlassian/moar-call-timeout-fixes

STASHDEV-7788 Cherry pick some changes from https://github.com/atlassian/hazelcast/pull/22