standardize to modern 'except FooError as err:' syntax (Final Part 4)
Merge pull request #4819 from hulu/except-as-four-final

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