Integrated the new version of XStream that contains the fix. (cherry picked from commit 585eb87c) Conflicts: changelog.html