Hot fix: JAXBContext contained merge-conflict and was breaking build.

Note: The previous hot fix is still needed, diamonds are build-breakers.

Signed-off-by: Marcel Valovy <marcel.valovy@oracle.com>