Add a timeout to service discovery [#3440]

Closes #3440 (closed). Adds a timeout to service discovery requests, defaulting to 2 seconds.

Changelog: feature