Merge "Use diffs for iptables restore instead of all rules"

diff --cc neutron/agent/linux/iptables_firewall.py
Simple merge

diff --cc neutron/agent/linux/iptables_manager.py
Simple merge

diff --cc neutron/tests/functional/agent/linux/test_iptables_firewall.py
Simple merge

diff --cc neutron/tests/unit/agent/test_securitygroups_rpc.py
Simple merge