Support heimdal from ports and base
Merge branch '5.8p2'

* 5.8p2:
  Support heimdal from ports and base

Conflicts:
	Makefile