Update for handling networkId in firewallRule

Revoking firewall rules now has the networkId passed in as a compound on
the rule ID so that we don't have to search for the network in all the
rules.
Also some housekeeping.