Bring trunk changes into pluginjail branch (including updating to FreeBSD
9.x)
manual merge of trunk stuff to get build to work.