Make it possible to build oshmem again.
Fixes #4375: Move r31016 to v1.7 branch (Catch one more place where)

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

r31016 [[BR]]
Catch one more place where we need to use the actual topology instead of opal_hwloc_topology. Thanks to Tetsuya Mishima for the patch

Reviewed okay. RM-approved

cmr=v1.7.5:reviewer=ompi-gk1.7