[aws] mock setup block device deleteOnTermination
Merge pull request #2522 from engineyard/aws_block_device_mapping

[aws] mock setup block device deleteOnTermination