tree 4685c960f822f72bad240ca954bb153cb6609318
parent 8c18484ef22bdce77e8774d21613e5f221d921f9
parent 04d51ffe7cdc6705d0476d0dca99ef93a03b55c2
author Marco Miller <marco.miller@ericsson.com> 1553114137 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553114273 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Iac973ba8ead6c3315336022f32d9eb825d9e617d