Fixing BlockDeviceMapping to allow virtual_name of ebs to be specified