Bug 1017273 - Fix merge conflicts to help fix the CLOSED TREE