dae71d3a75
Needed to apply commit from PR #5778 to get this commit from PR #6238 to apply cleanly. Signed-off-by: Ralph Castain <rhc@open-mpi.org> (cherry picked from commit b19e5edf769858859c96b62d9b2644b44bcc3b03)