tree e1acd07ca9bf6e25d4a1f546d2812ea398060e0e
parent b420ceae68151ccace8363618b83cef76b8f04a3
parent 1542a5405947b64df842111e24656a40d4c34d43
author Marco Miller <marco.miller@ericsson.com> 1586032910 -0400
committer Marco Miller <marco.miller@ericsson.com> 1586032910 -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: I055b1fecf6f862a36823470d7785ade30ec55406