Make go-etcd workable with server timing out.

And add a TODO to refer the ticket here?