Folsom ec2 tags

and the patch for stable.