AA: firewall: merge r34472 and r34569

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34976 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: base-files: merge r34974 and r34975

git-svn-id: svn://svn.openwrt.org/openwrt/branches/attitude_adjustment@34977 3c298f89-4303-0410-b956-a3cf2f4a3e73
AA: generic: fix UBIFS build error if XZ compression is disabled

Backport of r34959.

Signed-off-by: Gabor Juhos <juhosg@openwrt.org>

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