tree d4dac2a7f623d9057bb931f28be7a463ef160366
parent 3392aa150449ecc3d8083c7d6bcbc57146f8e56e
parent dd26438b8971b1859d1ef06d3d58bdce40146c88
author Marco Miller <marco.miller@ericsson.com> 1553098234 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553098561 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: If50db1a9c2fd43e608d1b6ccbb0943be67e9bb58