[Help] Fix JSON generation to create conformant JSON

Change-Id: I5ac232360beff296d1c256a14a759912d9218cb7
7 files changed