tree 0bca92ec300ebe5defde2fabad5b5d8a733df1d9
parent 6081ae9afe25095326377b839430797da1bdadb1
parent 000da9352b185a4d2f175ba11874b67ede0aebba
author Marco Miller <marco.miller@ericsson.com> 1553114132 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553114262 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I97b755c41a9cd5179994d3e530ea62a563aeb315