Minor test enhancements for robustness
Merge branch 'slurm-2.6'

Conflicts:
	testsuite/expect/test14.4