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