wip
Merge branch 'master-tx' of github.com:gurbuzali/hazelcast into master-tx
wip