Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I5cb6e05d69db2e27149300255049b346f77d2e91