Update to latest undertow

This supersedes #691