HBSD: try to resolve/avoid merge conflict

Signed-off-by: Oliver Pinter <oliver.pntr@gmail.com>
Revert "HBSD: try to resolve/avoid merge conflict"

This reverts commit 2e5b51198b54f46e013eebe585832447e931b72b.
Merge branch 'hardened/current/ptrace' of github.com:HardenedBSD/hardenedBSD into hardened/current/ptrace