fixed JAXB annotations for extra XDS metadata in the simplified data model
Merge remote-tracking branch 'origin/master'