merge conflicts, adjust the build.

Reimport Heimdal dist converted into NetBSD dist format. The prior
import did not catch all of the $Id$ tags because many of them are
unexpanded and the RE was only looking for expanded keywords.

Import latest Heimdal from the head of their git repository into the
new location for externally maintained software.