Cleanup a couple of abstraction breaks - patch provided by Thomas Naughton

Fixes #4159
Fixes #4131: Move r30319 to v1.7 branch (Fix a merge issues with)

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

r30319 [[BR]]
Fix a merge issues with new ROMIO and fix obvious ROMIO bug.

cmr=v1.7.4:reviewer=jsquyres
Fixes #4161: Move r30369 to v1.7 branch (Update platform file)

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

r30369 [[BR]]
Update platform file

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