Updates for v3.0.5rc1#7040

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

jsquyres:pr/v3.0.5rc1jsquyres/ompi:pr/v3.0.5rc1Copy head branch name to clipboard