fixes #712
Merge branch 'master' of github.com:hazelcast/hazelcast
fixes #712
Cleanup and copyrights.