Merge changes I0a934283,I29c22724

* changes:
  Convert last FirewallController command to iptables-restore.
  Add tests for FirewallController::setInterfaceRule.