aws upload for current.json
include s3 upload as part of ftp upload process
Merge branch 'master' into aws