Merge pull request #21007 from micmac1/gnutls-unistring-optional