Merge branch 'stable-3.6' into stable-3.7

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

Change-Id: Iea04107d8bfab4627650ec1bd30ba817461df582