Merge "swift: Configure s3token appropriately"