Fixed unit test for cnt2server

Conflicts:

	src/lib/Libcmds/test/cnt2server/scaffolding.c