discovery: discovery will try forever when there is a timeout.

Perviously, etcd retries three times for timeout error. After this
commit, etcd retries forever. Also this commit make etcd client
aware of gateway timetout.
Merge pull request #1910 from xiang90/gateway

discovery: fix gateway timeout