Merge pull request #23056 from lukasj/b4

integrate jaxb-ri 3.0.0-M4