Signed-off-by: Jeff Squyres <jsquyres@cisco.com> (cherry picked from commit open-mpi/ompi@a70ecf5267)