diff --git a/neutron/hacking/checks.py b/neutron/hacking/checks.py
index 3dd3f826015..daec857c4ea 100644
--- a/neutron/hacking/checks.py
+++ b/neutron/hacking/checks.py
@@ -57,10 +57,7 @@ def _directory_to_check_translation(filename):
             "neutron/openstack",
             "neutron/scheduler",
             "neutron/server",
-            "neutron/services/firewall",
-            "neutron/services/l3_router",
-            "neutron/services/loadbalancer",
-            "neutron/services/metering"]
+            "neutron/services"]
     return any([dir in filename for dir in dirs])
 
 
diff --git a/neutron/services/service_base.py b/neutron/services/service_base.py
index d69c7960f01..6b4f4424397 100644
--- a/neutron/services/service_base.py
+++ b/neutron/services/service_base.py
@@ -20,6 +20,7 @@ import six
 from neutron.api import extensions
 from neutron.db import servicetype_db as sdb
 from neutron.openstack.common import excutils
+from neutron.openstack.common.gettextutils import _LE, _LI
 from neutron.openstack.common import importutils
 from neutron.openstack.common import log as logging
 from neutron.services import provider_configuration as pconf
@@ -78,14 +79,14 @@ def load_drivers(service_type, plugin):
             drivers[provider['name']] = importutils.import_object(
                 provider['driver'], plugin
             )
-            LOG.debug(_("Loaded '%(provider)s' provider for service "
-                        "%(service_type)s"),
+            LOG.debug("Loaded '%(provider)s' provider for service "
+                      "%(service_type)s",
                       {'provider': provider['driver'],
                        'service_type': service_type})
         except ImportError:
             with excutils.save_and_reraise_exception():
-                LOG.exception(_("Error loading provider '%(provider)s' for "
-                                "service %(service_type)s"),
+                LOG.exception(_LE("Error loading provider '%(provider)s' for "
+                                  "service %(service_type)s"),
                               {'provider': provider['driver'],
                                'service_type': service_type})
 
@@ -95,7 +96,7 @@ def load_drivers(service_type, plugin):
             None, service_type)
         default_provider = provider['name']
     except pconf.DefaultServiceProviderNotFound:
-        LOG.info(_("Default provider is not specified for service type %s"),
+        LOG.info(_LI("Default provider is not specified for service type %s"),
                  service_type)
 
     return drivers, default_provider