[WFLY-405] patching updates

fixes for https://issues.jboss.org/browse/WFLY-405