Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade testcontainers to 1.12.4

Change-Id: I5a48cdd50b68413880fa0cd6bff3d4e7c868f2ec