Merge "Remove CVS files" into release-4-6