Merge "Migrate to oslo.concurrency"

diff --cc neutron/agent/linux/iptables_manager.py
index 5c04b5e64ab1760a1aebfa26f2326517513c9953,bfd49f074527e5e0f7b2f92ef9a4339d2e65e464..d27ee6b3656a7d79ccaa530e749d5559ddfa6636
--- 1/neutron/agent/linux/iptables_manager.py
--- 2/neutron/agent/linux/iptables_manager.py
+++ b/neutron/agent/linux/iptables_manager.py
@@@ -29,10 -29,8 +30,9 @@@ from oslo_concurrency import lockutil
  from neutron.agent.common import config
  from neutron.agent.linux import iptables_comments as ic
  from neutron.agent.linux import utils as linux_utils
 +from neutron.common import exceptions as n_exc
  from neutron.common import utils
  from neutron.i18n import _LE, _LW
- from neutron.openstack.common import lockutils
  from neutron.openstack.common import log as logging
  
  LOG = logging.getLogger(__name__)

diff --cc requirements.txt
Simple merge