Merge "look for cloudformation templates in cfn directory"