Merge branch 'stable-3.8' into stable-3.9

* stable-3.8:
  Bump kafka-clients to v2.3.1

Change-Id: I04f83ad166d805a2b60ff5c1b9a89204253dcc97