Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  FileBasedWebSessionCacheTest: Fix IncompatibleArgumentType error
  Upgrade bazlets to latest stable-2.14 to build with 2.14.17 API

Change-Id: I92e226be81a462d3793ae996faf86acfa5d8d89e