Merge "libdm: dm-user target creation takes an additional argument"