Fix bug 873617 - Merge "Fix expanding timezone into the future" from upstream.
Fix bug 873611 - Merge "Fix Timezones with RDATE information" from upstream.