Update / fix documentation
Merge branch 'jaxb-2_2_11-branch'