tree 055f59fd5cce44aa6f5e06a5cbe40cb374a4cc78
parent e8af8f9ab1d5cab079c6db99a4ac351970dd0a07
parent 846f7152518942e543bbc0c357e4a2d661d0907d
author Marco Miller <marco.miller@ericsson.com> 1553090786 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091434 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I6ea4697309e14b1bb2fb1729c043014d33fc30c2