Issue #17225: JSON decoder now counts columns in the first line starting

with 1, as in other lines.

diff --cc Lib/json/decoder.py
Simple merge

diff --cc Misc/NEWS
Simple merge