merge conflicts, adjust the build.

Import latest heimdal-1-5-branch from git

Ok'ed + reviewed by elric@

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