Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Iaedd17246e07b9b57e742a19f7de836e374c85a2