Conflicts: src/Makefile.am src/common/gres.c src/plugins/mpi/pmi2/spawn.c src/srun_cr/Makefile.am src/srun_cr/Makefile.in