AA: firewall: merge r34472 and r34569

git-svn-id: svn://svn.openwrt.org/openwrt@34976 3c298f89-4303-0410-b956-a3cf2f4a3e73