Backport patches for 1.14.5

Some patches that looked useful. Maybe there are more.

I might need help rolling the tarball for this one since some of the infrastructure we have in 1.16/master is missing (bindinator subproject etc.).