sharedfp/sm and lockedfile: fix naming bug#5609

bwbarrett merged 1 commit intoopen-mpi:v3.1.xopen-mpi/ompi:v3.1.xfrom

edgargabriel:pr/sharedfp-naming-conflict-v3.1edgargabriel/ompi:pr/sharedfp-naming-conflict-v3.1Copy head branch name to clipboard