adding s3 connection retry
merge...