Merge remote-tracking branch 'origin/release' into rekey

basice2e/run.sh

@@ -124,7 +124,7 @@ then
 
     # Start a user discovery bot server
     echo "STARTING UDB..."
-    UDBCMD="../bin/udb --logLevel 3 --config udb.yaml -l 1 --devMode"
+    UDBCMD="../bin/udb --logLevel 3 --config udb.yaml -l 1"
     $UDBCMD >> $UDBOUT 2>&1 &
     PIDVAL=$!
     echo $PIDVAL >> results/serverpids

basice2e/udb.yaml

 # UDB Config for E2E Integration test
-logPath: "./results/udb.log"
+log: "./results/udb.log"
 sessionPath: "./results/udbsession"
 sessionPass: "hello"
 certPath: "../keys/cmix.rip.crt"
-ndfPath: "ndf.json"
 port: "18001"
 keyPath: "../keys/cmix.rip.key"
 permCertPath: "../keys/cmix.rip.crt"
+permAddress: "0.0.0.0:18000"
+devMode: true
\ No newline at end of file