pfSense

Also take dhcpv6 into consideration even here.

Relax advanced options firewall rules tests

Various advanced options are now possible for any protocol since https://github.com/pfsense/pfsense/commit/653bde345e8f960de5bc745fe74e64d8ef3fd2d3
So allow these through the front-end GUI validation also.
Code change for 2.1 branch.

Fix double-click to edit on OpenVPN CSC entries

Remove prior CSC entry when cleaning up. Fixes #3143

Fix checkes for nested aliases containing FQDNs on static routes. It fixes #2941

Do not allow to add nested alias containing FQDNs when current alias is used on a static route, ticket #2941

Make sure an alias is not used by a static route before delete, ticket #2941

Fix check for existing IP Address in DHCP mapping

Even the Error message says: "This Hostname, IP or MAC address already exists." the IP Address was not checked if it already was given to a client as static mapped
Conflicts:
usr/local/www/services_dhcp_edit.php

Fix interface selections on UPnP to show the customized descriptions entered by the user. While here, add an external interface selection knob. Fixes #3141

Warn user that change will not take effect immediately