Merge "Rollforward w/fix of "Use json encoding for cquery ParseResult" Previous commit: commit fcc53f99."