Log Message:
Fix build on systems where format-nonliteral is turned on by default.

From coypu in PR 50753; already merged upstream.

While here, regen two patches.