Bug 1031143: Include omitted patch reject fixes. CLOSED TREE r=borked