- merge apache backports
- do not merge new apache default version (Mk/bsd.apache.mk)

Approved by:	portmgr (erwin@)
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."