delete file temporarily
Merge remote-tracking branch 'origin/master'

Conflicts:
	hazelcast-client/src/main/java/com/hazelcast/client/txn/XAResourceProxy.java
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
Merge remote-tracking branch 'origin/master'
fix on parallel class runner