Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ib6a03e6f98bba3abf42df3d0c81d1ab882d8434e