Merge changes I1f986a06,I8e5f8c51 into mcp/epoxy

* changes:
  Use dns.build_timeout for DNS client
  Increase the default DNS timeout to 60 seconds to prevent sporadic TimeoutException errors.