Bug 988402 - Getting everything ready to rebase and commit