CMS-3235 Upgrade to jdom2