quantum/neutron naming convention (when the service name wasn't set, try to identify it by referencing its type)
Merge branch 'openstack-driver-computeNetwork-fixes' into openstack-driver-computeNetwork
Add static secgroups and fix tests