Conflicts: src/plugins/launch/poe/Makefile.in src/plugins/launch/slurm/Makefile.in src/plugins/select/serial/Makefile.in testsuite/slurm_unit/common/Makefile.in