Pulling upstream aws fixes

https://github.com/cloudlets/aws-template-library/pull/5
https://github.com/cloudlets/aws-template-library/pull/6