Merge "Stop configuring '[DEFAULT] use_neutron' for nova"