Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py failure
Bug1049842 - Change downloadUdatesVia2GForbidden text
Merge pull request #22667 from mcjimenez/bug1049842_v2

Bug1049842 - Change downloadUdatesVia2GForbidden text (r = [flod, matej, alive] )
Merge pull request #22629 from viorelaioia/bug-1040063

Bug 1040063 - [v2.1][v2.0] Intermittent test_settings_do_not_track.py fa...