Merge branch 'stable-3.1'

* stable-3.1:
  Adapt to the latest Gerrit on stable-3.0
  Do not block authentication operation during websession event send

Change-Id: I6e0f944afe57e53678493c3f37ed026b867d5f41