Merge "swift: Fix s3api/keystone interaction"