Merge branch 'stable-3.6' into stable-3.7

* stable-3.6:
  Log publishing of stream events in message_log file

Change-Id: I166e67f7b626f5390c37b481ed0ef3cbe752db31