resolve conflicts, document HEAD vs release import process.

merge conflicts, adjust the build.

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