Merge [49469], fix more newlines. Refs #2441. Probably not finished as subversion isn't being very helpful.