(cherry picked from commit 26c99a97)

(cherry picked from commit cb686a6a)

(cherry picked from commit c92fb905)

(cherry picked from commit f44a60f9)

openvpn export, advancedoptions shouldn't be escaped https://forum.opnsense.org/index.php?topic=4427.msg16748#msg16748

(cherry picked from commit 012d0b90)

(cherry picked from commit d4cf6d17)

(cherry picked from commit c0cb9dbc)

(cherry picked from commit e574dcc6)

(cherry picked from commit 7f230df7)

(cherry picked from commit 168393a4)

(cherry picked from commit 895e30d1)

(cherry picked from commit f20640d0)

dhcrelay: change the description and help text to make it clear multiple servers are supported (#1360)

* dhcrelay: change the description and help text to make it clear multiple servers are supported

* dhcrelay: minor spelling errors

(cherry picked from commit 60b48f01)

isset() vs !empty(), when the legacy code stores false.... it eventually translates into a missing entry after save, before save, it's set with false....

(cherry picked from commit 3a96c1dd)
(cherry picked from commit e77d568e)

(cherry picked from commit 0dc512ee)

(cherry picked from commit 593d7525)

PR: https://github.com/opnsense/core/issues/918
(cherry picked from commit 21be9faf)

PR: https://github.com/opnsense/core/pull/1328/

(cherry picked from commit 2dac5fd2)
(cherry picked from commit 6b14bb27)
(cherry picked from commit b376646f)

(cherry picked from commit ffeb4bc6)

csrf, don't try to pass tokenkey, ref : https://github.com/phalcon/cphalcon/blob/v3.0.3/phalcon/security.zep#L377

(cherry picked from commit f5ef2379)

(cherry picked from commit 9eeca340)

* translation cleanup in src/www/services_ntpd_gps.php

* little translation fixes

(cherry picked from commit 97776b5a)
(cherry picked from commit d935d8da)

(cherry picked from commit 03b1091f)

(cherry picked from commit cc945783)

(cherry picked from commit ed2ded1c)
(cherry picked from commit 15c1e714)
(cherry picked from commit 8d7757f2)
(cherry picked from commit c3687a0c)

(cherry picked from commit 98333c13)
(cherry picked from commit 56f7c3f8)

(cherry picked from commit 858b12e8)
(cherry picked from commit 3f97985b)

(filter) move bogons, without breaking application logic, for https://github.com/opnsense/core/issues/1331

(cherry picked from commit 4dbc24ef)

(cherry picked from commit c5b1ddef)

(cherry picked from commit 9079f06d)

Now stable/17.1 is a little ahead of master, since master is
still used for both 16.7 and 17.1.