Merge branch 'stable-3.6' into stable-3.7

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

Change-Id: Ic78526a5da11a6ac1b988ecce434988b5888fb0c