Revert "Revert "Fixed issue #2342""

This reverts commit e1bcaa930b98398cd4a6982a3c979aff4f0e9aaa.
Revert "Revert "Fixed issue #2388""

This reverts commit 3a1082d72003dfda2c6ee56b7ca6580795b5dd67.
Fixed hazelcast configs for tests.
Fix typos
Merge branch 'typos' into 1.7.1