bug #3321: Update references to EC2_INSTANCE_TYPE

(cherry picked from commit d3bd5f7fab520480ee8b64c3c1d5fc3dec688320)