Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I1fe75ddeee653e2d55fa26ed3929433a702e2ad6