Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ic8a1f8822ddc026447455f1d717d983bfb2c3ec8