Incorporate downstream patches

There are a number of downstream patches from Ubuntu/Debian to fix defects. We should upstream these patches.

To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information