Work in progress

This shouldn't be merged.  It is being used to test the beta package of aws-cfn-bootstrap from AWS.