Pass correct UUID when starting ebs instance - EUCA-6384

EUCA-6384
Merge remote-tracking branch 'origin/dev/sjones/EUCA-6384' into testing