Merge from 4.2-dev for TRQ-1300: recover jobid when numjob tag is corrupted.