Change neutron service name for devstack

Neutron service name changed in queens, so
update the name here so that the driver
will be loaded.

Change-Id: I31a84c1fdd607ac73e9439790410b6160f482d14
Signed-off-by: Victor Pickard <vpickard@redhat.com>

devstack/plugin.sh

@@ -59,7 +59,7 @@ if is_service_enabled l2gw-plugin; then
         neutron_service_plugin_class_add $L2GW_PLUGIN
         configure_l2gw_plugin
         run_l2gw_alembic_migration
-        if is_service_enabled q-svc; then
+        if is_service_enabled neutron-api || is_service_enabled q-svc; then
             echo_summary "Configuring networking-l2gw"
             if [ "$NETWORKING_L2GW_SERVICE_DRIVER" ]; then
                 inicomment $L2GW_PLUGIN_CONF_FILE service_providers service_provider