Merge pull request #1707 from edx/benp/s3sync-improvements

Make s3sync error message uniform.

playbooks/roles/aws/templates/send-logs-to-s3.j2

@@ -99,7 +99,7 @@ onerror() {
       {"Subject": { "Data": "$message_string" }, "Body": { "Text": { "Data": "!! ERROR !! no logfile" } } }
 EOF
     fi
-    echo "ERROR: syncing $s3_path on $instance_id"
+    echo "Error syncing $s3_path on $instance_id"
     {{ aws_cmd }} ses send-email --from {{ AWS_S3_LOGS_FROM_EMAIL }} --to {{ AWS_S3_LOGS_NOTIFY_EMAIL }} --message file://$message_file --region {{ aws_region }}
   else
     echo "Error syncing $s3_path on $instance_id"