Issue #2504607 by juanjesustrigo, sasanikolic, mgifford, dawehner: Change the return of fieldFilterXss to FieldFilteredMarkup (cherry picked from commit 163b5102)