tree 8a3c241cb542fb5608bccd0f347c452dd642d51a
parent 0c60748340ec4a48c5a1872bf33ac1464b4ab3c7
parent d06d3bf65c4bc5866e13ecf87b9455f2d3b3c27f
author Marco Miller <marco.miller@ericsson.com> 1553098233 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553098558 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I87316c67513a26986c9338d0d37bd406ef5d74db