Tweaks to make upload-to-aws.sh script work from Jenkins and with older version of s3cmd.