Signed-off-by: Ralph Castain <rhc@open-mpi.org> (cherry picked from commit d7283807410c1d37d966180847debe1d43361e92)