AA: backport firewall3 package from trunk