tree 4f86343822cb34368f7572aaef50057b5547f6b9
parent 1215eeddd70786600b1835818ce7a7c3f4916890
parent ca316424c923d5bf94e2fbafdfb35d0fd2009c1b
author Marco Miller <marco.miller@ericsson.com> 1586033122 -0400
committer Marco Miller <marco.miller@ericsson.com> 1586033122 -0400

Merge branch 'stable-3.1'

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

Change-Id: I32f1dbe109a2a18f133e4b79a53faa6dec265f78