svn merge -r14381:14407 https://eris.llnl.gov/svn/slurm/branches/slurm-1.2

NEWS

src/slurmd/slurmd/req.c

src/slurmd/slurmstepd/req.c

testsuite/expect/test1.50

testsuite/expect/test1.7

testsuite/expect/test1.8

testsuite/expect/test3.5