Sync up with baptiste's latest version which also fixes the bad paths.
Hopefully this still builds in FreeNAS - will test that next (of course
it builds outside of FreeNAS, but that doesn't necessarily mean anything).
Merge branch 'freenas/9-stable' of gitserver.ixsystems.com:/git/repos/freenas-build/ports into freenas/9-stable