Refactor json for coretests to include criteria information.

This information is needed to build displays that include the
scores of specific tests.  We will need this for discussions related
to the scoring of tests in the future.

In order to add capabilities, we also needed to create a
top level hash.

Change-Id: I4ad213afca382ec4a401f0ffe2f4ac3c007ce967
Merge "Refactor json for coretests to include criteria information."