Merge branch 'wickberg/docs' into 'master'

See merge request SchedMD/dev/slurm!3171