Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Upgrade testcontainers to 1.12.3

Change-Id: I74ca3b1614c1fd2017bbb3276c9d138ab068bdeb