Kepler

A simple fix is to add:

if (token instanceof MatrixToken) {
            value = String.valueOf( ((MatrixToken)token).toString());
        }
        if (token instanceof XMLToken) {
            value = String.valueOf( ((XMLToken)token).toString());
        }

to TokenUtil's getStringValue(Token token).
But maybe this isn't a nice enough formatting for the reporting 2.0 release?

For the xml case, JDOM's XMLOutputter could be used to format the xml string.

Should be fixed in 2.0 at r25111.
Leaving open for testing and until checked into trunk.

I checked this fix into trunk at r25112

Original Bugzilla ID was 5094