Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I2e44de3f946dbc7f9c65516e3d5571bafd77dab6