tree f12bdf9cddeb0b36c7900d7729f166a65f24a748
parent 93150d84cce76400ce526e525b6a35ebee436455
parent c736b63a1f8f19a2d6355b6999f03aeb145a9b9f
author Marco Miller <marco.miller@ericsson.com> 1553098238 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553098573 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I7eddeebb843c9d6d2496192e52ca57a668930686