Bug 862719 - Fix continuous integration issues