Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Upgrade testcontainers to 1.14.2

Change-Id: I26fb7e3c6cc9ab0601ab7b39dd05c4ab97ab37ce