Fix #3866 Firewall Log Filtering

on 2.1 branch
Merge pull request #1283 from phil-davis/patch-16