JSON dump generator: code clean-up and documentation update

Change-Id: Ide37f4fbddcaf020d460e82292081e438720d4cb
Merge "JSON dump generator: code clean-up and documentation update"