Merged EC2 flavor info from develop