TEIID-2580 expanding the fix to xpathvalue