Move aws infrastructure away from m1 and c1 as Amazon is retiring those instance types.
Changes the AWS instance types to try not to get HVM instances.