Merge branch 'stable-3.1' into master

* stable-3.1:
  Upgrade testcontainers to 1.15.1

Change-Id: I43c13d603d24fd630bd8c243309fda53680f1c95