Use the new block device mapping format

Move the block device copying to use the new format introduced in
Havana.

Fixes OS-203

Change-Id: I8cbad215647334bfb796f3029e2c886136a97d55