[Bug 226453] Merge Review: system-config-boot