[WFLY-405] some more patching updates

this contains some additional commits which are part of the EAP PR for patching.