Tidy up of JsonDumperCommits

Change-Id: I59210a689abc2a62cc4a1c28ca8f1eaed037b059
Merge "Tidy up of JsonDumperCommits"