Sync with undertow upstream