tree 64893b4d25cb53abd8505b90768640e1b05e8dcf
parent de4ea73673ba67cd58d55ae1110b11f019b8ee11
parent eb8024f017c61805161c3dff5b059b1cdb1aabb4
author Marco Miller <marco.miller@ericsson.com> 1553090775 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091409 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Ib6a03e6f98bba3abf42df3d0c81d1ab882d8434e