PIVOT-964: (merge from 2.0.x) trim-whitespace, and update SvgSalamander jar to latest stable, but built by me from their sources using latest tag 1.0.38 (and a small fix in one class there to fix a class not found compiler error). Note that with this now all seems to work :-) .