Add support for srun to forward cpu count per node to slurmd, which

sets new environment variable SLURM_CPUS_ON_NODE for use by LAM/MPI.
Also fixed bug in srun task distribution logic for block distribution
in heterogeneous cluster.