tree 8905ba585c25f22f3858c6d3486d5c76b93eb4c4
parent 74c54aca9ebf65a43c4756e1b70f5fc8344bae14
parent 9bd9d291a643a532038ba98835281cf58a25fb67
author Marco Miller <marco.miller@ericsson.com> 1586034172 -0400
committer Marco Miller <marco.miller@ericsson.com> 1586034172 -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: I2a3244edfea052ca757decd2ee8f566cdc3abae0