TRQ-2590. Fix a regression around heterogeneous cray jobs caused by using job ids internally.