test improved
cleanup
Merge branch 'master' of github.com:hazelcast/hazelcast into xa-test-improvement/3.2-RC3

Conflicts:
	hazelcast-ra/src/test/java/com/hazelcast/jca/LocalTransactionTest.java
	hazelcast-ra/src/test/java/com/hazelcast/jca/NonTransactionTest.java
	hazelcast-ra/src/test/java/com/hazelcast/jca/XATransactionTest.java
Merge pull request #1970 from gurbuzali/xa-test-improvement/3.2-RC3

test improved