JS-259 Upgrade JDom to 2.0.4
Large but straightforward change.
Merge branch 'master' into jdom
Merge pull request #37 from dmsmith/jdom

JS-259 Upgrade JDom to 2.0.4