Fix 6238 for v3.1.x#6455

jsquyres merged 2 commits intoopen-mpi:v3.1.xopen-mpi/ompi:v3.1.xfrom

hppritcha:topic/6238_for_v3.1.xhppritcha/ompi:topic/6238_for_v3.1.xCopy head branch name to clipboard