ALPS - Fix issue when tracking memory on a PerNode basis instead of
PerCPU.

Before it wasn't taking into account if the user was requesting per node
memory or the job was told it needed to use less than the node allowed.
Merge remote-tracking branch 'origin/slurm-14.03' into slurm-14.11