[FIXED JENKINS-17656] Fix temp file creation and error message handling
Merge remote-tracking branch 'origin/master'