Code cleanup and fixes for boto modules
Merge pull request #12742 from lyft/boto-cleanup

Code cleanup and fixes for boto modules