tree db19dc7aa2d1763bcdc6e142a058ca3a990bf68a
parent 5b3541bb43570529bbe6b2e9f0e9dd743994bd26
parent a76cd72ed206dcc58cfcc46e6c1674a1757a82a0
author Marco Miller <marco.miller@ericsson.com> 1553090771 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553091401 -0400

Merge branch 'stable-2.14' into stable-2.15

* stable-2.14:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I740fa5c794dcb74d831a3fae9ef240c191006acd