issue1000 cleanup
fixes #1000
Merge branch 'master' of github.com:hazelcast/hazelcast into issue1000/master/enchancement
Merge pull request #1010 from sancar/issue1000/master/enchancement

Issue1000/master/enchancement