Merge changes I7c3ddf08,If15a46e9

* changes:
  Convert {enable,disable}Firewall to iptables-restore
  Add a unit test for FirewallController::{enable,disable}Firewall