CRAY - Support CLE 4.2.0
Merge remote-tracking branch 'origin/slurm-2.5'