TRQ-2785 - merged from 4.2-dev: if a job is preempted and then canceled later its error and output files are not returned.