tree 0665e4816dd859f91d5f02fa72e2b14ac087311a
parent 6c749f6e9a269211adbd9df60986d86068a62cc7
parent ebe6452d2350c5ed05bc7ce2dba2b38275fe199d
author Marco Miller <marco.miller@ericsson.com> 1553090787 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091437 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: Iac0a6617b28507a3be977808c1e44653b78b50a5