Merge "dm: default-key: Adapt legacy disk format for new set of arguments"