Fix sinfo output so that host in state allocated and mixed will not be
merged together.
Merge remote-tracking branch 'origin/slurm-2.6'