Fix memory leak in emulated Cray/ALPS system
Merge branch 'slurm-2.6'