Conflicts: devmapper/deviceset.go Upstream-commit: 73545199a8e84ebc7e44bf2595c7f7b0e20f04a1 Component: engine