[sr-dev] git:master:fe2db1bf: cdp: removed svn ids and fixed some clang compile warnings