merge 3.4 (#21642)

diff --cc Lib/test/test_grammar.py
Simple merge

diff --cc Misc/NEWS
Simple merge

diff --cc Parser/tokenizer.c
Simple merge