Cb17 fixup#640

lil-cain wants to merge 2 commits intocloudtools:maincloudtools/troposphere:mainfrom

lil-cain:cb17-fixuplil-cain/troposphere:cb17-fixupCopy head branch name to clipboard