Backport talloc-2.1.6 changes...
I don't expect we will be backporting talloc 2.1.6 any further than currently done.