merge conflicts, adjust the build.
branches: 1.1.1;Initial revision
Import latest Heimdal from the head of their git repository into thenew location for externally maintained software.