MFH: r360653

- Fix pkg-rquery -I to have all expected output.

Obtained from:	upstream 29c9c84e0e11c2c182a8d79634344e57bf2575f1
With hat:	portmgr
Reported by:	dteske
Make sysutils/pstree operable in jailed environment.

(cherry picked from commit 0aa00da618ffa2bc5b4c4f8b89be22b9df2e9936)
Fixed replacement of $(PGBOUNCER_RUNDIR) in files/pgbouncer.in
Revert "Define and use "our_gid" variable."