Cherry pick in upstream Babel

This pulls in a number of fixes, but not most of the commits from upstream Babeld. The goal is to reduce incidences of strange bugs for which there are solutions already available.