Merge "Add JSON output to the RKP factory tool"