Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I4e1377275cb889389da465d1b6cd77975f3a5c6e