Merge branch 'stable-3.1'

* stable-3.1:
  Log websessions when they are produced and consumed

Change-Id: I1363e3d9ccff8d5065c807a4ffd0861f07a57e90