Update s3cmd client with code unification