Build fix and cleanup
Merge branch 'IZPACK-973' of github.com:rkrell/izpack into IZPACK-973