Merge proposals dependent on lp://qastaging/~cjwatson/indicator-datetime/cleanup-timezone-monitor

1. cleanup-timezone-monitor
2. Dependent merge proposals