TRQ-2396. Fix some problems around the cleanup of heterogeneous jobs. Also fix their files being mis-named on the moms.
Merge branch '4.2-dev' of https://github.com/adaptivecomputing/torque into 4.2-dev