fixes for WFLY-1822, WFLY-1823, WFLY-1803
be more strict about the patch-id