This reverts commit 084787c0. Conflicts: NEWS contribs/pmi2/pmi2_api.c src/plugins/mpi/pmi2/mpi_pmi2.c