Merge branch 'stable-3.1'

* stable-3.1:
  Upgrade testcontainers to 1.14.2

Change-Id: I0f7b9927716c6ff7d7a1cb011cdc1cf11039caae