Fixes #3682: Move r28834 to v1.7 branch

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

r28834 [[BR]]
Removing bogus references in iboffload code.

cmr:v1.7:reviewer=hjelmn