- Setting default to JAXB (instead of JSON) and minor fixes
(cherry picked from commit 2fc467278735f6c449a56c722e9c088f08886d89)