tree 4713cb52bc2b4d9ab2333a6e088e6519ffff48d8
parent 06beb814004afe157a2c19355c125b789a95fbf4
parent 053de5b30ccfe81ff1d09b8b079d6add84f11ab6
author Marco Miller <marco.miller@ericsson.com> 1553098235 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553098564 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I963a882687e855181a69ecbebe80fd991363cdc6