Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Consume events-broker from source
  Bump up events-broker version to 3.5.1

Change-Id: Ie97237a41a24a21580046cce4cce8164697e1f1d