tree 60698abe645c9ce8baadddd494562891b31111b0
parent 35b1d17823444e43924a059ff846e1372bde7932
parent f3a6bb76b929fdd4614346c0e75fad147d4e13a7
author Marco Miller <marco.miller@ericsson.com> 1553098225 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553098541 -0400

Merge branch 'stable-2.15' into stable-2.16

* stable-2.15:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I9a93e6f3aa37918eb1e45b62c064e169d0c3503e