Fixes #4840: Move r32431 to 1.8

---svn-pre-commit-ignore-below---

r32431 [[BR]]
Clarify when oshmem is enabled/disabled. Thanks to Paul Hargrove for the language

cmr=v1.8.3:reviewer=jsquyres