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