Revert to using neutron-legacy based services
Revert to using neutron-legacy based services

The patch to remove the use of the test-matrix [0] also switched from
using the neutron-legacy based service names (q-*) to the new neutron-*
names. However it turns out that the new implementation is not yet working
properly for most neutron-consuming projects, so we switch back to the
previous situation for now.

[0] https://review.openstack.org/546765

Change-Id: Id6de87211d6c4ea8fd14aa9203d8d5b17e9e2f04

nawawi/openstack,nawawi/openstack,noironetworks/devstack,openstack-dev/devstack,openstack-dev/devstack,group-policy/devstack,dtroyer/devstack,noironetworks/devstack,dtroyer/devstack,group-policy/devstack