Integrate changelist 6120, from //guest/dimitry_andric/revml/branch/5088:
Only set CVS source files to "binary" filetype when the CVS keyword
substition option is "-kb", not when it is "-ko".
This is because Perforce doesn't expand RCS keywords by default anyway,
and most CVS repositories use "-ko" for importing vendor branches.