Final JAXB conformance
Merge pull request #1144 from emmanuel-keller/1.6

Final JAXB conformance