discoverd/client: Move test helpers to testutil

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
router: Fix goroutine leak

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
router: Fix off-by-one in etcd watch

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>