Merge "init: fix first stage mount failure due to /dev/device-mapper not found" into oc-dev