Fixing versions for continous delivery
fixing versions
Fixing compilation issues
Merge branch 'master' into hazelcast-cache