a few more import order fixes for upcoming flake8-import-order
Merge pull request #839 from reaperhulk/more-import-order

Import order fixes for generation scripts