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