HHH-8894 - Use an "upgrade" approach to validate and bind (JAXB) mapping XML