Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I154f6a07330bfb67ff97a1497d2d1086e64f9984