Merge "Increase timeout for domains with many DNS entries." into jb-mr2-dev