bug #3321: Update references to EC2_INSTANCE_TYPE