Branch b1_6

b=16860
i=nathan
i=rread

Description: Excessive recovery window
Details    : With AT enabled, the recovery window can be excessively long (6000+
	     seconds). To address this problem, we no longer use
	     OBD_RECOVERY_FACTOR when extending the recovery window (the connect
	     timeout no longer depends on the service time, it is set to
	     INITIAL_CONNECT_TIMEOUT now) and clients report the old service
	     time via pb_service_time.