Modify test for change in how squeue reports node state alloc or idle
Disable a test for select/serial plugin
In select/serial enforce both node and core count for reservation createio
Merge branch 'slurm-2.5'

Conflicts:
	testsuite/expect/test15.21