Updated JSON schema - see test.json for an example

Change-Id: I617827fc5596e574337d83dd319596e8f44a16a9
Merge "Updated JSON schema - see test.json for an example" into red_black