tree a25dc704019d5df02056de897f3c3df349ccea59
parent 2b9378ae15eff47f9a816c18391d283471462618
parent 5f432c3278bfe70300ac342edb43c07272d9bc52
author Marco Miller <marco.miller@ericsson.com> 1553114130 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553114256 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ic8a1f8822ddc026447455f1d717d983bfb2c3ec8