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 "Adds swift user to the Object Storage Service install steps"
Merge "Some edits and fixes"