Merge "L3 Agent restructure - observer hierarchy"

diff --cc neutron/agent/l3/agent.py
index 7b2fa3d87e1efc2ab16d3be88629c7815b6c85e6,f598124c5643cf8c5ec58295456223f11fc338ae..279c332e2edcd527230c8cef37a24d5d8aa45c3e
--- 1/neutron/agent/l3/agent.py
--- 2/neutron/agent/l3/agent.py
+++ b/neutron/agent/l3/agent.py
@@@ -50,8 -51,10 +51,9 @@@ from neutron import manage
  from neutron.openstack.common import log as logging
  from neutron.openstack.common import loopingcall
  from neutron.openstack.common import periodic_task
 -from neutron.openstack.common import processutils
  from neutron.openstack.common import service
  from neutron import service as neutron_service
+ from neutron.services import advanced_service as adv_svc
  try:
      from neutron_fwaas.services.firewall.agents.l3reference \
          import firewall_l3_agent

diff --cc neutron/tests/functional/agent/test_l3_agent.py
index 0eaab4bbdb2453f47ff16eb35586e745a7efe010,0c99a59235bd2d28d18dd52bc672669953f58d56..e24ca504c07acbda54b035a820a32fcda5ca9f27
--- 1/neutron/tests/functional/agent/test_l3_agent.py
--- 2/neutron/tests/functional/agent/test_l3_agent.py
+++ b/neutron/tests/functional/agent/test_l3_agent.py
@@@ -33,9 -27,9 +33,10 @@@ from neutron.common import config as co
  from neutron.common import constants as l3_constants
  from neutron.openstack.common import log as logging
  from neutron.openstack.common import uuidutils
+ from neutron.services import advanced_service as adv_svc
  from neutron.tests.common.agents import l3_agent as l3_test_agent
  from neutron.tests.functional.agent.linux import base
 +from neutron.tests.functional.agent.linux import helpers
  from neutron.tests.unit import test_l3_agent
  
  LOG = logging.getLogger(__name__)