v4.1.x: Fix a couple managed allocation issues.#8355

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

awlauria:managed_allocation_v4.1.xawlauria/ompi:managed_allocation_v4.1.xCopy head branch name to clipboard