Resolve a conflict #14926 #14938

4.3.0 release notes should not be on the
v4.2.x branch (but 4.2.x release notes are/will be
in main/v4.3.x).

(cherry picked from commit ee10f11)

Author: michaelklishin