Update distro patches after 2b76d02

Cleanup distribution patches in 1.4 branch to account for 2b76d02
without fuzz.

(cherry picked from commit 6e00f1149073dd30a31142e9a23bf16f9feb9d3c)