Conflicts: devmapper/deviceset_devmapper.go Upstream-commit: d3505d836ac98a95b2129206844b6e4d6ad24927 Component: engine