Merge pull request #854 from andymc12/815-optionalJaxb

[#815] Indicate that JAXB is optional