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