Recommend that the sandbox be a clean checkout.
Fix issues updating cvs tree before import.

- Use -Q rather than -q so that conflicts can be logged.
- Capture stdout and log both it and stderr if the cvs operation fails.