tree 7000e16a5a4bccb09ae6a8f9b9b5a16398d82509
parent d1bb31a81c16e28c766a1e7fc901f0abf590764f
parent 3bcbbfa87ef443759e312798246f73a7322e3c26
author Marco Miller <marco.miller@ericsson.com> 1586033961 -0400
committer Marco Miller <marco.miller@ericsson.com> 1586033961 -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: I5fcdbc37b7a50da7b37e8046ac039a2dc6499c00