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