adding s3 connection retry
fixed  merge issue.