From-SVN: r110204
which included commits to RCS files with non-trunk default branches. From-SVN: r85900
From-SVN: r69872