Update Undertow and fix few subsystem issues

This PR supersedes  #4734 and #4740