[FIX] XQuery, XSLT Module: preserve input URI whenever possible
Merge remote-tracking branch 'upstream/master'