Fix mismerge by synching with the version in head.

Approved by:	portmgr (erwin)
Make sysutils/pstree operable in jailed environment.