Conflicts: src/common/slurm_step_layout.c src/plugins/select/cons_res/job_test.c src/plugins/select/cons_res/job_test.h src/plugins/select/cons_res/select_cons_res.c src/srun/libsrun/opt.c
