Update cinder configs (remove nova-volume references)

Also, fix an error in the iscsi settings