Update framework tools to add name in json

Name of the test can now come from the json description
rather than inferred from the directory. Old method remains to
keep functionality with older tests

Change-Id: I79f872103ae6a101b5cc799af91c933839f28dfb