Merge from 4.2-dev for TRQ-2317: .OU and .ER files not deleted upon successful staging out of files at end of job.