Merge branch 'stable-2.16' into stable-3.0

* stable-2.16:
  Align testcontainers with v1.15 in Gerrit

Change: I03f2b574eb is reverted, as dependency on testcontainers was
removed.

Change-Id: I16a22d4a93a850d4f15c4371cb160a624b8d6ead