* Fix race with base contedt cancel and final run update * Use scheduler waitgroup to wait for all running jobs to exit: