EC2 service no longer deletes instance metadata on run error - EUCA-9599
Merge remote-tracking branch 'origin/dev/sjones/EUCA-9599' into testing