[WFLY-405] patching updates

Patch bundle fixes and tests.