Reintroduce timeout and keep-alive for watch requests to match client-go

Reintroduce timeout and keep-alive for watch requests to match client-go #2847