Hello 6.0.5_PATCH
Pull up following revision(s) (requested by htodd in ticket #1046):
	distrib/sets/lists/comp/shl.mi		patch

Fix MKDEBUG=yes build problem.
Pull up following revision(s) (requested by hannken in ticket #1047):
	crypto/external/bsd/heimdal/dist/lib/roken/resolve.c	1.2

PR/48718: Juergen Hannken-Illjes: Heimdal leaks file descriptors
Add missing call to free the resolve handle on success.
XXX: pullup 6
Ticket 1046 and 1047.