Simplify PMI configure logic. Master commit:

open-mpi/ompi@75d8a7f

@jsquyres please review