tree 1b70bd60b75b91c37b6cd1dadd00b36eb95cabf7
parent d6cdeb0d2dfe4da2339931b1d281ace2ba38d3dd
parent a3a1c40fd60c50b01c1203e86f2b37287da43c28
author Marco Miller <marco.miller@ericsson.com> 1594926707 -0400
committer Marco Miller <marco.miller@ericsson.com> 1594926707 -0400

Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  e2e-tests: Replace hardcoded scheme with property

Change-Id: Ia7d81d31b38d61ee1143912bfdc4734f8acc7243