Merge branch 'upgrade-jaxb-libraries'