[VOL-5177] - verify_voltha-openolt-adapter_sanity-test failure

jjb/*
---------------------------------------------------------
  o Added function enter/leave for log mesage consistency
  o Update more sh """ calls to sh(label:foo, script:bar) for logfile context.
  o minor npm-groovy-lint cleanups to shorten the warning report.

vars/volthaDeploy.groovy
vars/volthaInfraDeploy.groovy
-----------------------------
  o re-indent buffer so npm-groovy-lint is usable.
  o Log more progression messages to help debugging.

Change-Id: I5824164dbb8f9c516691672219d6d7476212ccd1
diff --git a/vars/pkill_port_forward.groovy b/vars/pkill_port_forward.groovy
index d935701..286e341 100644
--- a/vars/pkill_port_forward.groovy
+++ b/vars/pkill_port_forward.groovy
@@ -123,11 +123,12 @@
     }
     catch (Exception err) {  // groovylint-disable-line CatchException
         ans = false
+        String iam = getIam(name)
         println("** ${iam}: EXCEPTION ${err}")
         throw err
     }
     finally {
-        enter('main')
+        leave('main')
     }
 
     return(ans)