Merge pull request #21874 from thess/unbound-SSL-workaround