Merge pull request #556 from jansupol/xml.jdk17