tree 8bc1cda4cd664aa629a1442b2daa02f4f34e167c
parent 5ebd191b76cca5d947c79c92076ea6fafa5baa79
parent b6928a653e997726bebc8e8565feac97a56dda77
author Marco Miller <marco.miller@ericsson.com> 1586032975 -0400
committer Marco Miller <marco.miller@ericsson.com> 1586032975 -0400

Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  e2e-tests: Unhardcode test scenarios project names
  e2e-tests: Add JAVA_OPTS support to plugin scenarios

Change-Id: Id7de063f1f7e5e7712213069ca8d8c1535787128