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