Merge branch 'jh/json-writer'

Preparatory code to later add json output for telemetry data.

* jh/json-writer:
  json_writer: new routines to create JSON data

diff --cc Makefile
Simple merge

diff --cc t/helper/test-tool.c
Simple merge

diff --cc t/helper/test-tool.h
Simple merge