Fix element naming in EC2 error responses - EUCA-9176

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