Pr/v3.x/osc fixes#3366

jsquyres wants to merge 2 commits intoopen-mpi:v3.xopen-mpi/ompi:v3.xfrom

jsquyres:pr/v3.x/osc-fixesjsquyres/ompi:pr/v3.x/osc-fixesCopy head branch name to clipboard