Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  FileBasedWebSessionCacheTest: Pass test upon invalid key

Change-Id: I887aeaff16a4421bc35ff924ed7ac71f847c1bd2