Bug fixed OAR_JOB_ID -> OAR_JOBID
Bug fixed OAR_JOB_ID -> OAR_JOBID
Merge branch 'rel-v6r11' into rel-v6r12
Merge branch 'rel-v6r12' into integration