update test scripts for the new ccn-lite-ctrl output; eliminate duplicate code in the utilities, updating the Makefile