Improve compatibility with new version of Job DSL

Change-Id: I1f14610d3804bf1c5a926bc6485defba20735f04