Updated rate limiter timeout message

Also updated regular timeout message to not show requestId if it
is empty (to avoid confusion).

Author: connelly38

driver/src/main/java/oracle/nosql/driver/http/Client.java

@@ -924,7 +924,8 @@ public Result execute(Request kvRequest) {
         kvRequest.setRateLimitDelayedMs(rateDelayedMs);
         statsControl.observeError(kvRequest);
         throw new RequestTimeoutException(timeoutMs,
-            requestClass + " timed out: requestId=" + requestId + " " +
+            requestClass + " timed out:" +
+            (requestId.isEmpty() ? "" : " requestId=" + requestId) +
             " nextRequestId=" + nextRequestId() +
             " iterationTimeout=" + thisIterationTimeoutMs + "ms " +
             (kvRequest.getRetryStats() != null ?

driver/src/main/java/oracle/nosql/driver/util/SimpleRateLimiter.java

@@ -181,7 +181,7 @@ public int consumeUnitsWithTimeout(long units, int timeoutMs,
         if (timeoutMs > 0 && msToSleep >= timeoutMs) {
             uninterruptibleSleep(timeoutMs);
             throw new TimeoutException("timed out waiting " + timeoutMs +
-                "ms for " + units + " units in rate limiter");
+                                       "ms due to rate limiting");
         }
 
         /* sleep for the requested time. */