Interleave test task config with their json

Place the json for each root task output after the root task definition
to help correlate the two to make it easier to debug and develop new
tests.

Change-Id: Ib27020f71317c8cb3ca5520cf4f2d239dddf0fe7
2 files changed