JENKINS-20789: manage new instances (C3, G2, HI, HS, CC2, CR1); upgrade to com.amazonaws:aws-java-sdk:1.6.7
Merge pull request #71 from jcarsique/fix-JENKINS-20789

JENKINS-20789: manage new instances (C3, G2, HI, HS, CC2, CR1)