Minor test suite tweaks for launch/poe
Merge branch 'slurm-2.6'