2.5
cvs: Improve CVS controlled file completions.
(testsuite) Fix cvsps non-option completion test, add test for options.