Merge from 4.2-dev for TRQ-1729: handle bad array and job files correctly.