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