MFC r250463:
	Permit relative paths with mergemaster -m

PR:	bin/173929
MFC r250303:
	Remove includes for old versions of FreeBSD.

Reviewed by:	stass
MFC r249949:
Take some improvements from DragonFlyBSD:
		- add const where appropriate
		- add static where appropriate
		- fix a whitespace issues