diff --git a/.pylintrc b/.pylintrc
index a44dd1e3b6a..23acf2095f3 100644
--- a/.pylintrc
+++ b/.pylintrc
@@ -22,7 +22,6 @@ disable=
  no-member,
  no-method-argument,
  no-self-argument,
- no-value-for-parameter,
 # "W" Warnings for stylistic problems or minor programming issues
  abstract-method,
  arguments-differ,
diff --git a/neutron/plugins/ml2/drivers/cisco/apic/apic_sync.py b/neutron/plugins/ml2/drivers/cisco/apic/apic_sync.py
index 83735aae387..b72cd6b8e6f 100644
--- a/neutron/plugins/ml2/drivers/cisco/apic/apic_sync.py
+++ b/neutron/plugins/ml2/drivers/cisco/apic/apic_sync.py
@@ -82,7 +82,8 @@ class ApicBaseSynchronizer(SynchronizerBase):
                                                            port['id'])
             network = self.core_plugin.get_network(ctx, port['network_id'])
             mech_context = driver_context.PortContext(self.core_plugin, ctx,
-                                                      port, network, binding)
+                                                      port, network, binding,
+                                                      [])
             try:
                 self.driver.create_port_postcommit(mech_context)
             except Exception:
diff --git a/neutron/wsgi.py b/neutron/wsgi.py
index d8440f103bc..6723a135a34 100644
--- a/neutron/wsgi.py
+++ b/neutron/wsgi.py
@@ -682,11 +682,6 @@ class Debug(Middleware):
 class Router(object):
     """WSGI middleware that maps incoming requests to WSGI apps."""
 
-    @classmethod
-    def factory(cls, global_config, **local_config):
-        """Return an instance of the WSGI Router class."""
-        return cls()
-
     def __init__(self, mapper):
         """Create a router for the given routes.Mapper.