os and java version
Merge branch 'master' of https://github.com/projectdanube/xdi2.git