There is an issue with current implementation of extend_recovery_timer() where the timeout calculation is wrong if we want to extend timeout value by a client estimate. This issue was imported by commit: 8da33c6cc5192303fcd18f45892e1f115004e662.

In this task, I'm going to restore the code to 2.1 release.