Merge "Upgrade dom4j to latest"