Merge changes I84461d40,Ib3ab9105 into qt-dev

* changes:
  Allow overlaying the DNS probe timeout.
  Add a timeout for the DNS probe.