tree f89ae01cd9e03704ed38cb0942a559da06216fbe
parent 7dd9c84d154d1dbed732412c3ddcc5372878d434
parent c45c75e4e1098a044425d488d65239204f8b59f8
author Marco Miller <marco.miller@ericsson.com> 1586033373 -0400
committer Marco Miller <marco.miller@ericsson.com> 1586033373 -0400

Merge branch 'stable-2.16' into stable-3.0

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

Change-Id: I1f98276a7a2c896435cdc6c817ac0c50ee196561