Cosmetic mods

No change to logic
Merge branch 'slurm-14.11'