[WIP] For review purposes only... Fix block device mappings

Might read nicer as a case statement:

```ruby
case block_device_mapping
when options['block_device_mapping_v2']
  ...
when options['block_device_mapping']
end
```