Create new branch named "dragonfly"
manpage/conf: Bring in DragonFly changes

This is basically a test commit.
Sync with trunk (resolve 1 conflict)
WIP: Merge DragonFly bits from 2.3 -- untested
Merge with trunk at branch for 3.0

Resolved conflicts for:
	poudriere.8
	bulk.sh
	common.sh
	jail.sh
	testport.sh