Comment 7 for bug 2068645

My lvm2 merge needed for other packages, was bitten by this multipath-tools bug.
I tried to merge, and then I discovered that a merge was already done and waiting for review.
I compared with my changes, and looked really nice and good, with some minor changes (e.g. the kpartx-boot removal).

I sponsored it, thanks a lot!