pfSense

missing "("
(cherry picked from commit 70381d4803b9424c1a3f3ef518d8243062452d77)

optional arg for old behaviour
(cherry picked from commit cf63f1638aab685cc956502f5ddd862a10bf3ff8)

Simplify convert_seconds_to_hms() and show days for large numbers of hours

1) Function can be simplified and all "if" statements removed, using intdiv (or casting result as int for PHP < 7) and % for calcs and sprintf for padding.
2) Input validity check before trying to convert format...

Use global backup count instead of hardcoded value and remove redundant function
(cherry picked from commit 01b5410ae8391998ba560d40f447c7f556472c5b)

set default_config_backup_count based on platform

At the same time the platform is being detected for PHP/GUI purposes, set the default number of backups. Also handle the case where (for any reason) detection fails, which it shouldn't, so the variables are still created...

Add missing recommended key lengths to OpenVPN options

Add key lengths to the OpenVPN options, for asymmetric keys of size 3072 (for current use), 7680, 15360 (for long term resistance), 8192 and 16384 (common binary exponents).

These are both supported by OpenVPN anyhow, and for certain uses are currently recommended (eg long term resistance to replay/decryption). See keylength.com for citations....

Make QinQ interfaces work again

(cherry picked from commit 1322ee22354f1a6e184819fb7009a2996b63de97)

Allow IGMP Proxy logging verbosity to be selected via system log settings (PR 2901)

(cherry picked from commit 2bd0585e30e5ec8fc3b79ca3f579bf9a7c1bcbc8)

adding privileges and separating DNS Resolver overrides from general settings

(cherry picked from commit fc76a1e390c8ce9579df31457c74d1d0e572b78d)

Only call interfaces_vips_configure once if it's needed, rather than doing the same thing over and over for every VIP on an interface. Ticket #6515