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