Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Iac973ba8ead6c3315336022f32d9eb825d9e617d