Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I82935d9095f199b5938d4eb38e80ec5b0c5295fa