Merge branch 'stable-3.1' into stable-3.2

* stable-3.1:
  HttpSession: Align project name encoding with gerrit core

Change-Id: Ifd4089b0e316750d850b2a8c58f0ee4b91d1139f