Sync with OpenStack Swift v1.13.1

Signed-off-by: Prashanth Pai <ppai@redhat.com>