[WIP]collect aws cloudformation templates and stacks at Amazon refreshing

See @lfu's recent PR to fix it.  It breaks reporting.