KCINFR-870: removing single use of jdom in our codebase
Merge pull request #487 from leoherbie/jdom_remove2

KCINFR-870: removing single use of jdom in our codebase