object-storage: rebase Swift to 1.8.0 (grizzly)

Two minor tweaks found while packaging 3.4.0-0.1.alpha2 for Fedora 19

BUG: 948039
Change-Id: I97175636164702cf4042bc4a18ffead76ad386cb
Signed-off-by: Kaleb S. KEITHLEY <kkeithle@redhat.com>
Reviewed-on: http://review.gluster.org/4807
Reviewed-by: Jeff Darcy <jdarcy@redhat.com>
Tested-by: Gluster Build System <jenkins@build.gluster.com>