TRQ-2472: Merge from 4.2-dev. Lingering problems with massive delete of array jobs.