Revert "changed the default to no request timeout"

This reverts commit 3fab8d74855bb4b4fb05b0cfb8eeaea72c1b5a2e.
Revert "remerged patch from go-etcd branch to handle request timeout"

This reverts commit d6a6339838b4d2d4ed7eb184ac671cbb92706ad6.
merged change for watch timeout