HBASE-27205 Fix tests that rely on EnvironmentEdgeManager in branch-2…

….4 (addendum) (apache#4631)

Signed-off-by: Andrew Purtell <apurtell@apache.org>
Signed-off-by: Viraj Jasani <vjasani@apache.org>
(cherry picked from commit f5f248d)
Change-Id: I061fe714855e6f4963b1743c53ced9f4dd9f44b6

hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java

@@ -6496,7 +6496,7 @@ protected RowLock getRowLockInternal(byte[] row, boolean readLock, final RowLock
       if (call.isPresent()) {
         long deadline = call.get().getDeadline();
         if (deadline < Long.MAX_VALUE) {
-          int timeToDeadline = (int) (deadline - System.currentTimeMillis());
+          int timeToDeadline = (int) (deadline - EnvironmentEdgeManager.currentTime());
           if (timeToDeadline <= this.rowLockWaitDuration) {
             reachDeadlineFirst = true;
             timeout = timeToDeadline;