Merge branch 'master' of https://github.com/eminn/hazelcast into eminn-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'
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of github.com:hazelcast/hazelcast
client configuration from xml fix
fix for xml config
Merge pull request #1817 from enesakar/master-client-xml

Master client xml