PIM-1113: Clean JobInstanceType and make it works with new JobInstance implementation in BatchBundle