Pull in r3828 from upstream (remove dead code, fix prototypes)
import ldns 1.6.17
import unbound 1.4.21
import unbound 1.4.22
Upgrade to latest ldns (1.6.17) and unbound (1.4.22).

MFC after:	3 weeks