Merge branch 'master' into CLDCONNECT-1435
Try to fix flaky tests by sleeping 5s to allow S3 to update