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
Merge "New and updated options for swift in icehouse"