This change updates legacy type hints that use the old Union[...] form

to use modern union notation instead.
This is the last of the conversion changes for old type syntax. There

will be one more change after this for fixing up other imports.

Ran unit tests.