Bug 1004929 - Follow up bug 1003752 - Gaia integration test failures on TBPL
Merge pull request #18881 from crdlc/bug-1004929

Bug 1004929 - Follow up bug 1003752 - Gaia integration test failures on TBPL r=kgrandon