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