Fixes #3846: Move r29428 to v1.7 branch (fix icc warning)

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

r29428 [[BR]]
fix icc warning
fixed by Dinar, reviewed by miked
cmr=v1.7.4:reviewer=ompi-gk1.7
Fixes #3827: Remove unused configure option from v1.7

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

r29367 [[BR]]
Remove an unused configure option, and comment that another
seemingly-unused configure option is used by downstream projects.