Bug 810644 - Fix merge conflict after separate backouts on multiple trees; r=me