Forward-porting another batch of SUSE patches

Note that I haven't finished testing this, but I'm sending this out for a first review. Would need help testing on Ubuntu (I'm currently finishing the test on SLES with packages).