[Bug 225886] Merge Review: hfsutils