tree 161ae90c05ee561de097c3c0ac3339b8cefc0d06
parent 985597f9704f8d4f7a4805276973453ad7b499b7
parent 8c2361413d320314ecbef787da98fd896cf24d1d
author Marco Miller <marco.miller@ericsson.com> 1553090784 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091428 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I2469e0a79fc0409d43b6c701d2a217b251c6d8da