Merge branch 'stable-3.0' into stable-3.1

* stable-3.0:
  Add missing dependency to jackson-annotations library
  Align testcontainers with v1.15 in Gerrit

Change-Id: I336e2fee317e792d886dbbf280613b761c0323ae