tree ba20f7aed46e169486eccc6759fed5c0a8084569
parent 4dafb5924aac683d762a828e2baf1fd5c9c2f449
parent 26d28ee7c6a32a00670cb1382f7bff793ad46def
author Marco Miller <marco.miller@ericsson.com> 1553114131 -0400
committer Marco Miller <marco.miller@ericsson.com> 1553114259 -0400

Merge branch 'stable-2.16'

* stable-2.16:
  Extend ServletModule instead of HttpPluginModule

Change-Id: I5cb6e05d69db2e27149300255049b346f77d2e91