Merge "radvd: pass -m syslog to avoid thread lock for radvd 2.0+"

diff --cc neutron/tests/unit/test_l3_agent.py
index e50eda7cc00aef1119f083500bb39b989fe9edeb,339dae14eca651ef02a6ad49748330c8fe7f22dc..507c663cdcf6b4d5f0526570f6583c6414f08f24
--- 1/neutron/tests/unit/test_l3_agent.py
--- 2/neutron/tests/unit/test_l3_agent.py
+++ b/neutron/tests/unit/test_l3_agent.py
@@@ -23,11 -24,10 +23,12 @@@ from oslo import messagin
  from testtools import matchers
  
  from neutron.agent.common import config as agent_config
 -from neutron.agent import l3_agent
 -from neutron.agent import l3_ha_agent
 +from neutron.agent.l3 import agent as l3_agent
 +from neutron.agent.l3 import ha
 +from neutron.agent.l3 import link_local_allocator as lla
 +from neutron.agent.l3 import router_info as l3router
  from neutron.agent.linux import interface
+ from neutron.agent.linux import ra
  from neutron.common import config as base_config
  from neutron.common import constants as l3_constants
  from neutron.common import exceptions as n_exc