svn merge -r17028:17040 https://eris.llnl.gov/svn/slurm/branches/slurm-1.3

We actually want to preserve the set_oomadj() function in slurm v1.4, but
have removed it completely from v1.3.