Correction to commit 9eb37af08f0134b8bc77205e48be5970856672e0

Command line argument would not be processed, but scontrol would
exit immediately
Modify test for changed scontrol output and disable with select/serial
Disable job --exclusive option with select/serial plugin
Merge branch 'slurm-2.5'