--- old/tests/system/src/test/java/test/util/Util.java	2018-10-31 23:44:49.971170187 +0530
+++ new/tests/system/src/test/java/test/util/Util.java	2018-10-31 23:44:49.728030698 +0530
@@ -76,6 +76,14 @@
         } catch (InterruptedException ex) {}
     }
 
+    public static boolean await(final CountDownLatch latch) {
+        try {
+            return latch.await(TIMEOUT, TimeUnit.MILLISECONDS);
+        } catch (InterruptedException ex) {
+            throw new AssertionError(ex);
+        }
+    }
+
     private static Future submit(final Runnable r, final CountDownLatch delayLatch) {
         final Throwable[] testError = new Throwable[1];
         final CountDownLatch latch = new CountDownLatch(1);