Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I006658576bafa384d88538a16ca5ab0151beff80