Undertow-related polishing
(cherry picked from commit 2750ab6)
Test compatibility with JasperReports 5.5.2