Merge branch 'stable-3.5'

* stable-3.5:
  Add explicit testcontainers deps for testing
  Include jackson-annotation explicitly

Change-Id: I4e676c5f91cb3ce7035578c7365ea0855eeff838