InvalidVolume.NotFound EC2 error if invalid volume on delete - EUCA-4880

EUCA-4880
Annotate component messages accordingly - EUCA-8799

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