Upgrade logic to support existing boot from ebs images and instances.

Fixes EUCA-5808