tree 3af8c6b231aad3809773ceb31e208975483bd6ed
parent 0acee042fc51b56b9913938577f2a359d3bef2df
parent 64ad65266a40cf296a628ffd059b704d0350222f
author Marco Miller <marco.miller@ericsson.com> 1553090783 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091425 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ia4027639fe12e4043feed6cfe7fa78e0cf5556b4