Some minor merge fixes
Update to 2.6.35.7
Update to 2.6.35.9