EC2 VPC additional filter aliases - EUCA-10203
Use lib/upgrade for DB upgrade temporary files - EUCA-10206
Fix message to component mapping - EUCA-10210
IAM check for instance profile on role delete - EUCA-10205

Deleting a role in use by an instance profile now fails with the error
code DeleteConflict (was NoSuchEntity)

EUCA-10205
Merge remote-tracking branch 'origin/dev/sjones/EUCA-10203' into testing
Merge remote-tracking branch 'origin/dev/sjones/EUCA-10205' into testing
Merge remote-tracking branch 'origin/dev/sjones/EUCA-10206' into testing
Merge remote-tracking branch 'origin/dev/sjones/EUCA-10210' into testing