[Bug 226234] Merge Review: patchutils