More maven work for the openjdk6 issues
Merge branch '3.0' of https://github.com/hazelcast/hazelcast into 3.0