Bug 1058362 - Fix failing gaia integration tests.
Merge pull request #23307 from Moz-TedC/bug1058362-fix

Bug 1058362 - Fix failing gaia integration tests. r=timdream