added support to retry file upload in case of S3 error
Merge branch 'retry_upload' into build