From-SVN: r18811
which included commits to RCS files with non-trunk default branches. From-SVN: r18766
From-SVN: r14877