Moved CdrdaoCliWrapper mock factory to test code and fix build..

Bad decision, test mock generator should not have been situated
in the production code.  Although Maven test worked, the
dependency of live against test code meant a clean mvn install
didn't work.