Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I1bf8cdd64fbfe19a680476a98e6b587950d1701c