Avoid crash if gres configuration inconsistent
Make S_SLURM_RESTART_COUNT item available to SPANK
Merge branch 'slurm-2.6'