Merge branch 'stable-3.3' into stable-3.4

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

Change-Id: I5f4a99fa43a96ba267a608734e6f1323a9cae80b