Fix two time zone calculation bugs, thanks to david white for the
excellent analysis; verified by me to be correct solutions.
Closes: #1063879