Fix some bugs from gb merges for tz

Not everything needed was merged through. This fixes the bugs
caused by that. After this change a non-functional option to set
a home time zone will be in master.

Change-Id: Ie180d93cb77e576840a6349aa1d8908ddaf12fa9
3 files changed