Bug 1042920 - Allow gaiatest testvars to overwrite default settings
Merge pull request #23048 from mschwart/bug1042920

Bug 1042920 - Allow gaiatest testvars to overwrite default settings. r=viorela