Bug: 12653 Always set $tz_local
Fix logic
Merge branch 'master' into horde_5_2