handle special case of cc1.4xlarge and cc2.8xlarge
Merge branch 'master' of https://github.com/Netflix/ice
Merge remote-tracking branch 'upstream/master'
[ice] removing cc2 type per fix from netflix/ice master