Update CloudFormation to support the latest API.
Keep argument order, default to None instead of []
Remove old TODO

We cannot change this while remaining backward compatible. A new method
is required if we want to implement this.
Merge pull request #2101 from danielgtaylor/cf-update

Update CloudFormation to support the latest API. Fixes #2101.