Fixing wrong handling for 'HEAT_JOB'

Change-Id: Ib60af5d07f31a44d6eade4ff9896ba713a40ac73