standardize to modern 'except FooError as err:' syntax (Part 2)
Merge pull request #4817 from hulu/except-as-two

standardize to modern 'except FooError as err:' syntax (Part 2)