This is extends the logic of commit ba58d59c to the following RPC types: job complete batch script complete and job step complete