SWITCHYARD-2291 - One final approach to the job waiting issue