Better check when related to commit e5635a76e2, and it was deemed ok to
pack it this way so we will not change it in 15.08
Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11
Merge remote-tracking branch 'origin/slurm-14.11'