Merge fix from 4.2-dev for TRQ-1841 and TRQ-1896 (stagein and checkpoint) job attributes did not work.