Bug 991679 - [v1.3] Investigate and try to fix test_ftu_skip_tour.TestFtu fails on v1.3
Merge pull request #18224 from viorelaioia/bug_991679

Bug 991679 - [v1.3] Investigate and try to fix test_ftu_skip_tour.TestFt...
Merge pull request #18135 from gaye/bug-974554

Bug 974554 - CalDAV parser should accept ical inside xml comments nested in <calendar-data> elements r=millermedeiros