Merge conflicts and NetBSD local changes.

Import of lvm2tools 2.03.43 and libdevmapper 1.02.29. Needed to fix
haad-dm merge, because current lvm2tools sources are broken and will be
removed.