Reduce error message prefixing.
Whoops, forgot that system does not work this way...
Merge branch 's3cmd_deployment' into integration