OSHMEM: integrate review comments from open-mpi/ompi-release#7
Merge branch 'master' of github.com:open-mpi/ompi