Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Iabad02caeb6e4763652b4a6f5731ca09d3d1ec5e