Serialize NoDevice block device mappings correctly

Fixes TOOLS-180