PIM-1526 : Fix errors in job instance controller introduced during clean up