Merge branch 'dm-missing-mapper' into dm

Upstream-commit: 54b0cd7cd1cbea8ca35716bd1b4a20a1900029f4
Component: engine

components/engine/runtime_test.go

@@ -121,6 +121,10 @@ func cleanupDevMapper() error {
 	// Remove any leftover devmapper devices from previous unit run tests
 	infos, err := ioutil.ReadDir("/dev/mapper")
 	if err != nil {
+		// If the mapper file does not exist there is nothing to clean up
+		if os.IsNotExist(err) {
+			return nil
+		}
 		return err
 	}
 	pools := []string{}