Merge remote-tracking branch 'upstream/master' into hardened/current/aslr
Merge remote-tracking branch 'upstream/master' into hardened/current/aslr
Merge branch 'master' into hardened/current/aslr
Merge remote-tracking branch 'freebsd/master' into hardened/current/aslr
Merge remote-tracking branch 'origin/hardened/current/aslr' into hardened/current/aslr
Merge branch 'hardened/current/aslr' into hardened/current/master
HARDENING: Import basic but important files. Add sysctl tunable for disallowing the MAP_32BIT flag for the mmap(2).

Conflicts:
	sys/conf/files
	sys/kern/kern_jail.c
	sys/kern/kern_pax.c
	sys/sys/jail.h
	sys/sys/pax.h