Upgrade undertow & xnio + additional fixes

This PR supersedes #4344