discoverd,router: Reconnect to etcd after watch timeout

Since coreos/etcd#880 watches will timeout after five minutes, this patch reconnects when this happens.

Signed-off-by: Jonathan Rudenberg <jonathan@titanous.com>
router: Add missing close of listener in test

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