CloudFormation support.
Merge pull request #2180 from jsmartin/cloudformation

CloudFormation support.