trq-1730 The previous fix was in the right direction, but needed to hang around for a few more interations to kill late launching jobs.