Changes requested on review comments. Scope: SLURM patch portion.