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
Some edits and fixes

Some edits as a followup to https://review.openstack.org/#/c/65871

Change-Id: I7a869696b5239f916f3f96677f9cc312778d991f
Adds swift user to the Object Storage Service install steps

backport:havana
Change-Id: I9f335751e9476fcd13ce2cd2e714a64045fdc897
Closes-bug: 1263649
Merge "Revert "Amended config instructions for cinder.config""
Merge "Adds swift user to the Object Storage Service install steps"
Merge "Some edits and fixes"