Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Fix typos in docs
  Receive stream events from events-broker directly

Change-Id: I1fa238877af95985356c39c9deadf0c450d8cb64