Jiri Popelka authored Feb 10, 2012 and Dan Williams committed Feb 13, 2012

nm_firewall_manager_remove_from_zone() is called from
nm_device_deactivate()

Also fix nm_firewall_manager_add_to_zone() to the latest
FirewallD1.zone.addInterface signature.