tree 377cbd932b5e1f004f5534cb0f3dd7624e3985a8
parent 8a803697692beaf10907cdcba11e81da812b4839
parent 90147ec11fa73983a39f16dd29b5a6940b0be306
author Marco Miller <marco.miller@ericsson.com> 1553114139 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553114279 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I1bf8cdd64fbfe19a680476a98e6b587950d1701c