adding condition to use either neutron or quantum depending on openstack version
neutron runs
readded submodule to point it to master
change default setting back to grizzly