Merge branch 'slurm-2.3' into slurm-2.4