Job handling update conflicts

@christian.hansen can you please create a working branch for this issue from the latest feature-staging branch and merge the master into it? It seems that the latest changes for job completion handling are incompatible with the staging branch.