network: firewalld: Separate remove and add

Before this change, both remove and add were done during closeup.

Now services that are marked for removal are removed at the beginning of
misc stage, so that if the service files will also be removed during
misc, firewalld will not need them anymore.

Change-Id: I6e033abf45888b98cac3c87d04bd744e7555ca4d
Signed-off-by: Yedidyah Bar David <didi@redhat.com>