v4.0.x: Fix a couple managed allocation issues.#8352

gpaulsen merged 2 commits intoopen-mpi:v4.0.xopen-mpi/ompi:v4.0.xfrom

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