Apollon Oikonomopoulos authored Jul 16, 2019 and Julien Cristau committed Sep 13, 2019

Git-Dch: ignore
(cherry picked from commit dfb997d2)

Manfred Stock authored Jun 15, 2019 and Julien Cristau committed Sep 13, 2019

The upstream commit 9db41703 [1] seems to fix an issue with the jetty9 version
that is currently in Debian testing which seems to be the cause for Debian bug

[1] https://github.com/puppetlabs/trapperkeeper-webserver-jetty9/commit/9db4170381e07165078e544340e12b38676c2613
[2] https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=924005

(cherry picked from commit aa45407c)

Drop jetty-9.2-compat patch and cherry-pick upstream commit
3f17472c39d804dbb1ef90f264bc2dcb092bbf57 fixing compatibility with Jetty
9.4.