Undertow 1.0.0.Beta7 + some subsystem changes