Upgrade logic to support same ephemeral disk behavior for boot from ebs images

Fixes EUCA-5877