Add timeout back into s3 connection
Merge pull request #11739 from techhat/issue11735

Add timeout back into s3 connection