euca-bundle-image fixes for TOOLS-294

Fixes for TOOLS-294 to enable EC2 AMI registration.