Always add full timeout for client RPC deadline

When an RPC with a blocking query is retried the deadline should include
the max query time, not just the remaining time in the initial query.
A query may block up to twice as long as requested if any retries occur.

agent/consul/client.go

@@ -272,7 +272,7 @@ TRY:
 
 	var deadline time.Time
 	if info != nil {
-		deadline = firstCheck.Add(info.Timeout(c.config.RPCHoldTimeout, c.config.MaxQueryTime, c.config.DefaultQueryTime))
+		deadline = time.Now().Add(info.Timeout(c.config.RPCHoldTimeout, c.config.MaxQueryTime, c.config.DefaultQueryTime))
 	} else {
 		deadline = time.Time{}
 	}