Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ib3d575b86b9b25894a870b2887e6813694e8b241