Merge "Fixes to run in node, and in workspace"
authorEric Ball <eball@linuxfoundation.org>
Mon, 10 Jun 2019 22:11:26 +0000 (22:11 +0000)
committerGerrit Code Review <gerrit@akraino.org>
Mon, 10 Jun 2019 22:11:26 +0000 (22:11 +0000)

Trivial merge