Firewall: Update config template.
Contrib: Make sure o_contrib is updated also on head-to-head upgrades.
Firewall: VZ compatibility.