Merge from 4.2-dev for TRQ-1729: Handle Bad Array ANd JOb FIles Correctly.