Merge the json branch into trunk.  Json is disabled by default for now.
Use the --enable-json option to configure, or set FOSSIL_ENABLE_JSON in the
makefile to turn json processing on.