Revert "Amended config instructions for cinder.config"

This reverts commit adfc7259f42f80588e138a3c210be0b53a89af8b
(not reverted: change of wording choosing -> choice)

The original text is correct for Icehouse. For Havana, connection in section DEFAULT is a deprecated setup.

Fix for cinder.conf file for Icehouse:
https://review.openstack.org/#/c/61736/

Change-Id: I001797be9b9421d6818ed902d494bd133bf41b79
Merge "Revert "Amended config instructions for cinder.config""