Fix typo
Exit scontrol command on stdin EOF
Merge branch 'slurm-2.5'

Conflicts:
	src/scontrol/scontrol.c