Ensure Undertow 1.1 compatibility

Issue: SPR-11914