minor bugfixes for build with jdk8
Merge branch 'jee7' of https://github.com/bratkartoffel/wfhcommon into jee7