Tweak test to work better with front-end mode
Merge branch 'slurm-14.11'