pfSense

Add missing \) and fix syntax

Extra "S" fixed - thanks @rbgarga
(cherry picked from commit d20b69c529654f2b5d4adf9ab2bba5116f980c64)

Add OpenVPN key lengths to Wizard - missed in original PRs

Original PRs and rationale:

• https://github.com/pfsense/pfsense/pull/2944 ("Add missing recommended key lengths/digest to Cert system")
• https://github.com/pfsense/pfsense/pull/2942 ("Add missing recommended key lengths to OpenVPN options")...

Sanitize 'zone' parameter on CP pages

Show a little more key info in main info table

• Key crypto info shown
• TAP/TUN appended to description (important descriptive distinction)
  (cherry picked from commit b1919bc7d635c875c9187df7ac4885cde7acf621)

Prepare pfSense-upgrade to work with new major OS upgrade

Add 'now' parameter do do_reboot() to force it to happen immediately

Make pkg_lock() and pkg_unlock() work with wildcards

Merge pull request #3137 from NOYB/Secure_SMTP_Connection_Modes_-_Mutually_Exclusive

Correct indentation.