Merge branch 'gerrit/trinity' into 'gerrit/morpheus'

Change-Id: Ia053f6fb913f356d54c35617654d075e3596f256
diff --git a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
index b2cd435..73a9243 100644
--- a/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
+++ b/hyracks-fullstack/hyracks/hyracks-util/src/main/java/org/apache/hyracks/util/NetworkUtil.java
@@ -180,6 +180,10 @@
         }
     }
 
+    public static String extractHostPort(URI uri) {
+        return toHostPort(uri.getHost(), uri.getPort());
+    }
+
     public static String encodeIPv6LiteralHost(String hostname) {
         return InetAddressUtils.isIPv6Address(hostname) ? "[" + hostname + "]" : hostname;
     }