(cherry picked from commit 619b089c)
(cherry picked from commit d97a1078)

(cherry picked from commit 587720a5)

(cherry picked from commit 6bfb6942)

(cherry picked from commit 631de412)
(cherry picked from commit d879cd91)
(cherry picked from commit 40ac776a)
(cherry picked from commit 02910b50)

(cherry picked from commit ddb33b3f)

(cherry picked from commit 74428f5b)

(trafficshaper) remove unused burst, in freebsd 10.2 it doesn't crash anymore, but doesn't appear to be very useful either. closes https://github.com/opnsense/core/issues/226

(cherry picked from commit f3bdca7d)

(cherry picked from commit 4addfd23)

(cherry picked from commit f34957ec)

Not merging ACL and menu entry yet

(cherry picked from commit bd07877f)
(cherry picked from commit 15b8b918)

PR: https://forum.opnsense.org/index.php?topic=3004
(cherry picked from commit d8f5a12d)

(cherry picked from commit 4497a242)

(cherry picked from commit 0c79cbe4)
(cherry picked from commit 31fe2500)
(cherry picked from commit 8f5bb5e9)
(cherry picked from commit 71bef746)

Not really satisfied with the HA split but let's just say it's a
work in progress...

(cherry picked from commit 16503424)

(cherry picked from commit bb9daf3a)

(IPS) add Add promisc mode / physical interface selection, closes https://github.com/opnsense/core/issues/935

(cherry picked from commit 3bacc745)
(cherry picked from commit 8b4b5bbb)

* optionally collect lagg and vlan parents when the physical device isn't configured yet

(cherry picked from commit 73ce0d60)

(cherry picked from commit 803fd5f5)

(cherry picked from commit eebc4bec)
(cherry picked from commit 92f791e1)
(cherry picked from commit 84152de6)

(cherry picked from commit 2578e763)

(ipsec) cleanup unused ciphers, add null cipher for testing purposes, fix some php warnings on empty arrays

(cherry picked from commit feae22dd)

(cherry picked from commit 6edd9027)

(legacy) filter_log.inv move convert_real_interface_to_friendly_descr out of parse loop, https://github.com/opnsense/core/issues/672

(cherry picked from commit b4395817)

NPT is a kind of abandoned feature that had a custom kernel patch.
I tried to trace the origin through OpenBSD, but their pf(4) since
switched away from separate binat rules in the last known form like
it is still in FreeBSD.

Furthermore, the original GUI commit looks odd in that it tries to
push the same traffic downwards that would match in the former line,
which acutally points upwards.  It's either that or completely zapping
the line.  For now, repair the rules reload by trying to retain the
spirit of what it tries to achieve and wait for further feedback.

This late bug report also suggests that virtually nobody uses NPT
today since we've had no upstream reports since at least 15.7 was
out.

PR: https://forum.opnsense.org/index.php?topic=3076.0
(cherry picked from commit 39eed8a1)

(cherry picked from commit f05b35d9)

(cherry picked from commit 5d7d465c)
(cherry picked from commit 3b630722)
(cherry picked from commit 266a1e87)

(cherry picked from commit b9095a55)
(cherry picked from commit 1bf8b3aa)

(cherry picked from commit 6ae6e594)

(cherry picked from commit 52e5e3a3)

(cherry picked from commit da90e813)

Suggested by: @fabianfrz

(cherry picked from commit aa19f4b1)

(cherry picked from commit f759d902)

(cherry picked from commit 5f3538e4)

(cherry picked from commit 48b9b3ff)

(cherry picked from commit cc9cede6)

(cherry picked from commit 7aa0cd11)

(cherry picked from commit cbcfc496)

(cherry picked from commit dde019de)
(cherry picked from commit 4a91515d)