Merge remote-tracking branch 'origin/slurm-15.08'

NEWS

contribs/pam_slurm_adopt/pam_slurm_adopt.c

doc/html/team.shtml

doc/man/man1/sacct.1

doc/man/man1/smap.1

doc/man/man1/squeue.1

doc/man/man5/slurm.conf.5

etc/slurmctld.service.in

etc/slurmd.service.in

etc/slurmdbd.service.in

src/plugins/burst_buffer/common/burst_buffer_common.c

src/plugins/burst_buffer/common/burst_buffer_common.h

src/plugins/priority/multifactor/priority_multifactor.c

src/sinfo/opts.c

src/sinfo/sinfo.c

testsuite/expect/test4.13