Merge branch 'cherrypick-2612-25.11' into 'slurm-25.11'

See merge request SchedMD/dev/slurm!2786