Merge branch 'stable-3.0'

* stable-3.0:
  Upgrade testcontainers to 1.12.5

Change-Id: Ia5edeacb627a9ed3e8ee0aef52567bbaef87e277