Merge branch 'stable-3.4' into stable-3.5

* stable-3.4:
  Bump events-broker to v3.3.2

Change-Id: Id3d18a28fae9ef4e28742e4ed731626fc7304030