Cvs: Remove some Cvs namespace usages

Change-Id: I73250f29ef9324d100202c855d78336935be7397
Reviewed-by: Tobias Hunger <tobias.hunger@digia.com>