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

Conflicts:
	usr.sbin/iscsid/Makefile
	usr.sbin/rpcbind/Makefile
Merge branch 'hardened/current/master' into hardened/current/ptrace

Conflicts:
	usr.sbin/iscsid/Makefile
	usr.sbin/rpcbind/Makefile
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/hardening
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/segvguard
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/log
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/userlandenhanced
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/chacha
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/hardening
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/segvguard
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/ptrace
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/log
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/userlandenhanced
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/chacha
Merge remote-tracking branch 'origin/hardened/current/master' into hardened/current/pie
Merge remote-tracking branch 'origin/hardened/current/ptrace' into hardened/current/unstable
Merge remote-tracking branch 'origin/hardened/current/log' into hardened/current/unstable
Merge remote-tracking branch 'origin/hardened/current/userlandenhanced' into hardened/current/unstable
Merge remote-tracking branch 'origin/hardened/current/chacha' into hardened/current/unstable
PTRACE: remove wrong versions.
Merge branch 'hardened/current/ptrace' of https://github.com/hardenedbsd/hardenedbsd into hardened/current/ptrace