Branch b1_6

b=14872
r=nathan,ericm

Only extend(rather than reset) the timer if the time_out value from client is
bigger than current max recovery timer.