ALPS - Add to commit d2cd76c9459dba5 after understanding the issue
better.
Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11
Merge remote-tracking branch 'origin/slurm-14.11'