Merge branch 'stable-3.2' into stable-3.3

* stable-3.2:
  Create HTTP session only for login requests

Change-Id: If76e038e2fd88f09f431f968fdad53ebe43f81a0