Handle no dhcpd settings when upgrading

This minor fix was in master but not 2.1 branch. I noticed the warning message when doing a fresh install/test of 2.1.4-release. It prevents the warning message:
Warning: Invalid argument supplied for foreach() in /etc/inc/upgrade_config.inc on line 3153
Might as well fix it it 2.1-branch also, in case there is another 2.1.n release.
Fix a regression introduced on 8d6c5f6621 that broke CARP+IP alias
Merge pull request #1244 from phil-davis/patch-11
Fix #3725:

- Fix match_filter_field() and also simplify logic
- Fix $filterfieldsarray initialization
- Avoid to have double spaces on filterfieldsarray['act']
- Fix filter on Firewall Logs