Fixed the detection that neutron is being used as the networking API

OS-255

In Havana the Networking Service name switch from Quantum to Neutron.
The logic that checks which networking API is being used (and what
datatype should be used) needed to be updated to reflect this name
change.

Change-Id: Ic289a59b81fd36e5ca30d6b52b6bd9005042fa2b
Merge 'Fix for Neutron detection (OS-255)' into havana/1.5

Change-Id: I09267d0f26a3e2b1914c868eb40da21c12c8937d