Improve test failure clean up
Merge branch 'slurm-2.6'