Move cord-tester voltha rest interface to use envoy.
Plus other misc. changes

Change-Id: I03c40841ef07d9c0523799dc2efbd7e0caa1e536
diff --git a/src/test/dhcpl2relay/dhcpl2relayTest.py b/src/test/dhcpl2relay/dhcpl2relayTest.py
index bd98557..e6a7745 100644
--- a/src/test/dhcpl2relay/dhcpl2relayTest.py
+++ b/src/test/dhcpl2relay/dhcpl2relayTest.py
@@ -44,6 +44,7 @@
 from CordLogger import CordLogger
 from portmaps import g_subscriber_port_map
 from CordContainer import Onos
+from VolthaCtrl import VolthaCtrl
 import threading, random
 from threading import current_thread
 log_test.setLevel('INFO')
@@ -51,7 +52,7 @@
 class dhcpl2relay_exchange(CordLogger):
 
     VOLTHA_HOST = None
-    VOLTHA_REST_PORT = 8881
+    VOLTHA_REST_PORT = VolthaCtrl.REST_PORT
     VOLTHA_ENABLED = bool(int(os.getenv('VOLTHA_ENABLED', 0)))
     VOLTHA_OLT_TYPE = 'simulated_olt'
     VOLTHA_OLT_MAC = '00:0c:e2:31:12:00'