Bug 979350 - fixup rebase failures