Making upgrade test work with quantum

- Modified service_control to work with neutron
  (Neutron services don't contain openstack- prefix)