Merge branch 'master' of github.com:SchedMD/slurm

NEWS

contribs/cray/munge_build_script.sh

doc/html/cray.shtml

doc/html/dist_plane.shtml

doc/html/mpi_guide.shtml

doc/man/man1/sacctmgr.1

doc/man/man1/salloc.1

doc/man/man1/sbatch.1

doc/man/man1/scontrol.1

doc/man/man1/sinfo.1

doc/man/man1/squeue.1

doc/man/man1/srun.1

doc/man/man5/cgroup.conf.5

doc/man/man5/gres.conf.5

doc/man/man5/slurm.conf.5

src/api/Makefile.am

src/api/job_info.c

src/common/parse_time.c

src/plugins/select/cray/cray_config.c

src/plugins/select/cray/cray_config.h