tree f12bdf9cddeb0b36c7900d7729f166a65f24a748
parent 6f6a6eea5cbdfa0bd41429aa95ee26400e140ccd
parent d8fb5a9d148aba3294d880329d32134f4904f426
author Marco Miller <marco.miller@ericsson.com> 1553114140 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553114282 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ib3d575b86b9b25894a870b2887e6813694e8b241