Merge "init: always initialize device-mapper"