CMS-2934 Replace usage of MixinXmlSerializer with JAXB MixinXml