Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I97b755c41a9cd5179994d3e530ea62a563aeb315