Merge "Refactor _remove_unused_security_group_info"

diff --cc neutron/agent/linux/iptables_firewall.py
index 8ad2db0a7b47a0562aeb25f96c7607fefb21ef5c,9896559dcd18d5ac4879018ac03a96099ad9293f..84ff967595c6ad6485fb40c615711df5e8dc2e7c
--- 1/neutron/agent/linux/iptables_firewall.py
--- 2/neutron/agent/linux/iptables_firewall.py
+++ b/neutron/agent/linux/iptables_firewall.py
@@@ -13,9 -13,9 +13,10 @@@
  #    License for the specific language governing permissions and limitations
  #    under the License.
  
+ import collections
  import netaddr
 -from oslo.config import cfg
 +from oslo_config import cfg
 +from oslo_log import log as logging
  
  from neutron.agent import firewall
  from neutron.agent.linux import ipset_manager

diff --cc neutron/tests/unit/test_iptables_firewall.py
Simple merge