fix test that was leaking JobThreads

so e.g. every time you ran workspace.EvaluatorTests,
some JobThreads were created that never went away afterwards
Merge branch 'master' into topic
Cherrypicking 88aeceb...