Fix error in 2.1 branch dhcp6prefixonly implementation

The Main branch code was in the correct place, but the version applied to 2.1 branch had this code in the wrong place.
Merge pull request #723 from phil-davis/RELENG_2_1

Fix error in 2.1 branch dhcp6prefixonly implementation
Implement an option to allow using the IPv4 connectivity interface for sending the dhcpv6 information. Usually useful for ppp[oe] type links and some ISP
Update rrd.inc

Fix this error
php: rc.bootup: The command '/usr/bin/nice -n20 /usr/local/bin/rrdtool update /var/db/rrd/system-mbuf.rrd N:U:U:U:U:U' returned exit code '1', the output was 'ERROR: expected 4 data source readings (got 5) from N:U:U:U:U:U'
Merge pull request #726 from N0YB/patch-2

Update rrd.inc
Allow advanced options state-related parameters to be used for TCP, UDP and ICMP

Allows the state-related parameters to be specified for UDP and ICMP as well as TCP. Discussed in forum http://forum.pfsense.org/index.php/topic,64653.0.html
Allow advanced options state-related parameters to be used for TCP, UDP and ICMP

Allows the state-related parameters to be specified for UDP and ICMP as well as TCP. Discussed in forum http://forum.pfsense.org/index.php/topic,64653.0.html
Close td
Fix #3103, cleanup ports fields when protocol changes