tree d74060b1299d12474448990b66c402be2450525f
parent d689466ad51bf95fc955c4639ce8e12d9b8c14b1
parent 841368da5ec5d5c9f437b90f5f4926f658087563
author Marco Miller <marco.miller@ericsson.com> 1553114127 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553114252 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I64d2cc46ca437f53849e4fd76107516ab4081021