Merge branch 'master' of https://github.com/mbert/cxf-xjc-utils
This closes #2