[Bug 226145] Merge Review: mkbootdisk