No longer need to patch yajl to version 1.1.0 for collector on OSX
Reset collector and ccng to origin/master before startup