which included commits to RCS files with non-trunk default branches. From-SVN: r69875
From-SVN: r49359