Fixes #3891: Move r29634 to v1.7 branch (use hca distance mapper by)

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

r29634 [[BR]]
use hca distance mapper by default
cmr=v1.7.4:reviewer=ompi-rm1.7