Updated openstack/openstack
Project: openstack-dev/devstack  f95fe33dcb7e4b261e1ff7aab877563709065158

Cleanup nova-cinder nova.conf section

Stop using deprecated conf names, don't override default values with
default values.

Change-Id: I2c7e0833a61926b9fc9b5de4e38fdd626501d78d