cgm.c: handle non-recursive remove requests

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
tests: convert to using the cgm program

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>