Bring time zone length behavior up to spec (#5563)

Bring time zone length behavior up to spec (#5563) #11804