Merge branch 'qa' into 'master'

See merge request SchedMD/dev/slurm!2057