tree c54e6d0890ff87d2ec01a05574eef79dbbfe079b
parent 20d562676cea6bc217379a0ac063b18aa00de38c
parent 5e9de8728eea1176789099140d7d384489ba8843
author Marco Miller <marco.miller@ericsson.com> 1553114135 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553114270 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I3a2ae7c42a6ad3956d19fb39715b7aba5df8152d