Merge branch 'stable-3.6'

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

Change-Id: I0253f46527a92cc1a8843c65164e6fc4e8acef3d