Manually backport the changes in PR #41615
Manually backport the changes in PR #41615

The automatic back-porting process did't work for this file since the
testing file has been renamed. I manually added the changes to
`timezone_test.py` that were present in PR #41615.

saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt,saltstack/salt