JS-259 Upgrade JDom to 2.0.4
Large but straightforward change.