Previously, if ami_block_device_mappings was set, and you were building from an existing image, it would get silently ignored, and changing root_device_name would be ignored. This changes that behaviour, so if ami_block_device_mappings is specified, it's respected.