Use salt iptables state again
Reorder
Merge branch 'firewall'