Bug 862719 - Fix continuous integration
Merge pull request #9228 from KevinGrandon/fix_ci

Bug 862719 - Fix continuous integration issues. r=janjongboom