[PATCH 0/2] Fix mocking around networkxml2firewalltest