Update distro patches after 2b76d02

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