Merge pull request #14688 from mhei/libxml2-iconv-support