Merge branch 'stable-3.5' into stable-3.6

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

Change-Id: Ifd00e325ee9e44d807b28b45c9bafeed5986d52b