New and updated options for swift in icehouse

Include the output of our diff_branches script for swift.

This output is generated with:
https://review.openstack.org/#/c/100070/
https://review.openstack.org/#/c/100332/
https://review.openstack.org/#/c/100348/

Change-Id: I15058715b45fc93adacab20118ba747e5a8d0349
backport: icehouse
Replaced names with  correct conf files

In section 3, subsection b of trove install guide,
wrong config files were present earlier. Replaced
trove-api.conf with trove.conf and trove-taskmaster.conf
with trove-taskmanager.conf in all occurences

Change-Id: I0469c2f41e2cfbf99a6a0772c46c1c64307a49ab
Closes-Bug: #1326619
Removed OBJECT_FILENAME in swift list container

Removed OBJECT_FILENAME in swift list container command.To
list the objects in a container, command was "swift list
CONTAINER OBJECT_FILENAME", but the correct command is
"swift list CONTAINER"

Change-Id: I81fde72e648a4284627f41cefa125e915aa3abbe
Closes-Bug: #1330838
Merge "Replaced names with  correct conf files"
Merge "New and updated options for swift in icehouse"