tree a25dc704019d5df02056de897f3c3df349ccea59
parent 252e1a027975f9d7732eedd78f11d91c5558a9be
parent cce0ccb31ccd49dd2c7c36bdc3a85fb744ce7b68
author Marco Miller <marco.miller@ericsson.com> 1553098228 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553098545 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I006658576bafa384d88538a16ca5ab0151beff80