Merge branch 'hardened/current/master' into hardened/current/ptrace

Conflicts:
	sys/sys/jail.h (fixed)
HBSD PTRACE: fix indent in jail.h

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
HBSD: reenable PAX_HARDENING in HARDENEDBSD kernel config

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
HBSD PTRACE: big syle cleanup

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
Merge branch 'hardened/current/ptrace' into hardened/current/unstable

Conflicts:
	sys/sys/jail.h (fixed)