Add --gen json:merge option, and disable merging by default
JSON generator: output complete descriptors
Merge branch 'json_fixes' into ZEDGE