Move some logic to eliminate CLANG error
Merge branch 'slurm-2.6'