Moved update_timeout to tcp_retransmit_timer from tcp_probe_timer.
Merge branch 'kis-2.6' into web10g-2.6